Modified market to use a Player class instead of a person class and created Player class
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders

Conflicts:
	src/com/teamoxygen/spacetraders/Marketplace.java