Commited, so I can merge.
Merge branch 'master' of https://github.com/gem-5/last-adventures
Added price to gadgets. Can now calculate Ship & Human net worth.
Merge branch 'master' of https://github.com/gem-5/last-adventures

Conflicts:
	src/main/java/edu/gatech/gem5/game/Character.java
	src/main/java/edu/gatech/gem5/game/Ship.java
Fixed merge bugs.
Added Mercenaries, fixed money, and improved name generation for Planets
& Humans
Fixed planet-naming bug
Added package statement.
Revised the MVC framework by introducing a Controller superclass for all controllers.