I just want to pull.
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/loads/species.txt
Merged stuff and fixed stuff.  All that I have left on my weeks goals is
to guarantee the player race in System Gen.
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/Input/PlanetLoader.class
	workspace/Manifest Destiny/bin/Worlds/SystemWorld.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