What have I done?
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/PlayOptions/BeginButton.class
	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/Worlds/MenuWorld.class
	workspace/Manifest Destiny/bin/Worlds/SystemWorld.class
	workspace/Manifest Destiny/src/Worlds/SystemWorld.java