reach limitations set
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	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
Merge branch 'master' of git@github.com:virodoran/manifest-destiny.git

Conflicts:
	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