Whoops, this might help.
Merge branch 'master' of https://github.com/TrainerGuy22/Oceania

Conflicts:
	oceania/entity/EntityOceaniaBoatWithChest.java