misc
Merge branch 'master' of https://github.com/sondrehav/onABoat

Conflicts:
	src/application.py