Made serializable
Merge origin/master
Saving implemented
Saving implemented
Stupid github thing commiting everything
Saving implemented
Merge branch 'master' of https://github.com/nkarusala/CS-2340-Fall-2014

Conflicts:
	build/built-jar.properties
	build/classes/spacetrader/EquipmentSlots.class
	build/classes/spacetrader/FuelTank.class
	build/classes/spacetrader/Planet.class
	build/classes/spacetrader/Player.class
	build/classes/spacetrader/SpaceShip.class
	build/classes/spacetrader/Universe.class
	build/classes/spacetrader/commerce/Market.class
	build/classes/spacetrader/commerce/Wallet.class
	build/classes/spacetrader/system/MainController.class
	build/classes/spacetrader/system/MarketScreenController.class
	build/classes/spacetrader/system/SpaceMapScreenController$MapPane$MapDragContext.class
	build/classes/spacetrader/system/SpaceMapScreenController$MapPane.class
	build/classes/spacetrader/system/SpaceMapScreenController.class
	build/classes/spacetrader/system/WelcomeScreenController.class
	dist/SpaceTrader.html
	dist/SpaceTrader.jar
	dist/SpaceTrader.jnlp
	src/spacetrader/Player.java
	src/spacetrader/commerce/Wallet.java
	src/spacetrader/system/MainController.java