Added methods to MarketPlaceController
Changed Shield to have child classes
Fixed stupid properties thing
trying to fix merging
Merge branch 'master' into Caleb_Branch

Conflicts:
	nbproject/private/private.properties
Merge pull request #6 from nkarusala/Caleb_Branch

Merging Caleb Branch to Master
Adding Cargo class, empty TradeGood enum, and updated ShipType to include numCargoSlots()
Updated Cargo with javadocs
Transitions game to MarketPlace
Added a PriceIncreaseEvent enum
Merge origin/master
Added EquipmenttSlots  to Spaceships
EquipmentSlots is a class which holds weapons, shields, or gadgets  on the spaceship.
It is initiliazed with the value given the ShipType enum.
Merge pull request #8 from nkarusala/Caleb_Branch

Added EquipmenttSlots  to Spaceships
Made changes to Cargo
Added CargoIsFullException
Now spaceship uses an the SpaceType enum to decide the initial capacity of the cargo.
Added FuelTank
Created InsufficientFuelException
Spaceship now carries a FuelTank and ShipType enum has a fuel attrivute
Added Wallet class
Added javadocs to exception classes
Added InsufficientFundsException class
Game Transitions to MarketPlace
FirstScreen has a button that lets you go to the market place now.
Added Name Generator easter egg
Added shortcut to welcome screen.
Created Market in Planet
Market will calculate the price of each good as well as which goods a planet sells.
Wrote the attributes for all the TradeGoods.
Minor edit to Market class