Music Credits added
Merge branch 'origin/gh-pages'

Conflicts:
	BroadsideRepo/Broadside/src/com/starboardstudios/broadside/controller/PlayController.java
Restart using Martin's save/load
Merge branch 'origin/gh-pages'

Conflicts:
	BroadsideRepo/Broadside/src/com/starboardstudios/broadside/gameunits/Model.java
Fixed Easy ship
Merge branch 'origin/gh-pages'

Conflicts:
	BroadsideRepo/Broadside/src/com/starboardstudios/broadside/gameunits/ships/EasyShip.java
Merge branch 'origin/gh-pages'
Text size change in fail state
Merge branch 'origin/gh-pages'