lomailu: veneille hieman bootstrappia
Lomamerge
Merge branch 'master' of github.com:Scrumboat/Project

Conflicts:
	app/views/boats/index.html.erb