Finally was able to merge and commit
Merge branch 'origin/gh-pages'
Merge branch 'origin/gh-pages'

Conflicts:
	BroadsideRepo/Broadside/bin/Broadside.apk
	BroadsideRepo/Broadside/bin/classes.dex
	BroadsideRepo/Broadside/bin/classes/com/starboardstudios/broadside/gameunits/Model.class
	BroadsideRepo/Broadside/bin/res/drawable/main_cannon.png
	BroadsideRepo/Broadside/bin/res/drawable/ocean.png
	BroadsideRepo/Broadside/bin/resources.ap_
Changed boat visuals