bugfixes
Merge branch 'master' of https://github.com/joshschmidt/CIS410_project

Conflicts:
	universe.cpp