Bringing everything together
Merge branch 'master' of https://github.com/vcnickerson/CS2340Project

Conflicts:
	SpaceTraders/nbproject/private/private.xml