Cleaned up Game class
Merged cleanup

Conflicts:
	src/boatGamePackage/Boat.java
	src/boatGamePackage/Game.java