i think this is just an update to unit speed that i'm just about to
overwrite
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	workspace/Manifest Destiny/bin/RTS/Unit.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/RTS/Unit.java