Merge branch 'development'

Conflicts: propinquity/src/main/java/pdgs/propinquitydynamics/App.java propinquity/src/main/java/pdgs/propinquitydynamics/PropinquityDynamics.j ava propinquity/src/main/java/pdgs/utils/Utils.java
csdashes · May 17, 2014 · f08f604 · f08f604
2 parents cfa1b62 + a7b52d6
commit f08f604
Show file tree

Hide file tree

Showing 15 changed files with 1,168 additions and 134 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ target/
 *.war
 *.ear
 
-.netbeans_automatic_build
+.netbeans_automatic_build
+data/export.gml