Added right and left side guns and improved cannon class
Merge branch 'master' of https://github.com/zyedidia/BoatGame1

Conflicts:
	src/boatGamePackage/Boat.java