Removing someones nonsense - still messy code
Merge branch 'master' of https://github.com/Robotic-Brain/WaterCraft.git