Getting up to date
Merge branch 'master' of https://github.com/runnedrun/olinoboat

Conflicts:
	CBI_sailbot_code/auto_trim_sails.py