my commit before pulling?
Merge branch 'master' of github.com:virodoran/manifest-destiny

Conflicts:
	workspace/Manifest Destiny/bin/Main/Game.class
	workspace/Manifest Destiny/bin/RTS/Team.class
	workspace/Manifest Destiny/bin/TBS/Planet.class
	workspace/Manifest Destiny/bin/Worlds/SystemWorld.class
	workspace/Manifest Destiny/bin/Worlds/World.class
	workspace/Manifest Destiny/src/RTS/Team.java
	workspace/Manifest Destiny/src/Worlds/SystemWorld.java