Add boat
Merge branch 'master' into feature/add-boat

Conflicts:
	README.md
Merge pull request #2 from seanmcmills/feature/add-boat

Add boat