Fixing stuff
Merge branch 'master' of
https://Robotic-Brain@github.com/Robotic-Brain/WaterCraft.git

Conflicts:
	WaterCraft/src/dgrxf/watercraft/entity/WCEntityBoat.java