Started working on Submarine (this will cause merge errors, please wait while I resolve)
Merge branch 'master' of https://github.com/TrainerGuy22/Oceania

Conflicts:
	oceania/entity/EntityOceaniaBoat.java