Update Sample Methods For Main Ship and Model
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	BroadsideRepo/Broadside/src/com/starboardstudios/broadside/gameunits/ships/MainShip.java
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Update Sample Methods For Main Ship and Model