noncommital commit, to pull latest
+1
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/Team.class
	workspace/Manifest Destiny/bin/RTS/Unit.class
	workspace/Manifest Destiny/bin/RTS/Units/Worker.class
	workspace/Manifest Destiny/bin/TBS/Planet.class
	workspace/Manifest Destiny/bin/Worlds/MenuWorld.class
	workspace/Manifest Destiny/bin/Worlds/SystemWorld.class
another
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/RTSObject.class
	workspace/Manifest Destiny/bin/RTS/Units/Worker.class
	workspace/Manifest Destiny/bin/loads/neighbors.txt
	workspace/Manifest Destiny/bin/loads/planets.txt
	workspace/Manifest Destiny/bin/loads/species.txt
	workspace/Manifest Destiny/bin/loads/specieslocation.txt