Needed to merge
Maybe some error fixes, still working on that.
Merge branch 'master' of
https://github.com/virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/Team.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
	workspace/Manifest Destiny/src/Generator/RTSGenerator.java