Merge pull request #7 from vcnickerson/controller/Ian/dev

Applied control logic. Set up transitional logic using framework develop...
Bringing everything together
Merge branch 'master' of https://github.com/vcnickerson/CS2340Project

Conflicts:
	SpaceTraders/nbproject/private/private.xml
Finished text interaction and cleaned up some visuals
Added interfaces for galaxy storage, cleaned up some of my old code.