Updated Controller - Kevin
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/view/CharacterCreationController.java
Added code to Ship class - Kevin
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders
Added Ship properties - Kevin
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/Marketplace.java
	src/com/teamoxygen/spacetraders/Ship.java
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders