Added some methods to Ship - Kevin
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/ships/Ship.java