Added Ship abstract class with minimal inventory functionality, as well as draft of trade window
Merge origin/noora into ambrose
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose
Modified PlanetDrawScreenController to save the solar system
M5 Progress
modified git ignore
Created Trade Screen and implemented some functionality
M5 Progress
M5 Progress
M5 Progress
M5 Progress
M5 Progress
M5 Complete
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose

M5 Patches
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose

M5 Patches
Merge branch 'master' of https://github.com/Rrego6/space_traders into raoul
Pulled from master, these are the changes made
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan

Conflicts:
	SpaceTrader/res/css/WelcomeScreen.css
	SpaceTrader/src/controller/PlanetDrawScreenController.java
	SpaceTrader/src/helper/CommonHelper.java
	SpaceTrader/src/model/Inventory.java
	SpaceTrader/src/model/Planet.java
	SpaceTrader/src/model/TradeGood.java
Merge branch 'master' of https://github.com/Rrego6/space_traders into raoul
Added gson library