Changing boat.ai back to private
Merge branch 'master' of https://github.com/Robotic-Brain/WaterCraft.git

Conflicts:
	WaterCraft/src/dgrxf/watercraft/entity/boat/ModularBoat.java