vessel
Merge branch 'master' of github.com:eileda/List-Manager

Conflicts:
	Vessel.cpp