Merge branch 'master' of https://github.com/BenjaminNie/Sailbots-Hackathon-Oct24

Conflicts:
	CoordinateInFishzone.py