Some stuff
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/Input/SpeciesLoader.class
	workspace/Manifest Destiny/bin/Main/GameCanvas.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
	workspace/Manifest Destiny/src/Worlds/MenuWorld.java
hurr durr