add text styles
Merge branch 'master' of https://github.com/xvitaliusx/wolverine

Conflicts:
	app/assets/stylesheets/boats.css.scss