jeanette stuff
Merge branch 'master' of https://github.com/mordod/Codecamp2013.git

Conflicts:
	SpaceshipData.py