cannot delete member with boat(s)
Merge branch 'master' of github.com:Scrumboat/Project

Conflicts:
	db/schema.rb