save/load works
save/load works
save/load works
Merge branch 'master' of https://github.com/linalana/ProgrammingPirates

Conflicts:
	SpaceTrader/src/spacetrader/engine/WelcomeScreenController.java
	SpaceTrader/src/spacetrader/model/Player.java
	SpaceTrader/src/spacetrader/model/RandomEvent.java
	SpaceTrader/src/spacetrader/model/ShieldHold.java
	SpaceTrader/src/spacetrader/model/WeaponHold.java