style changes
Merge branch 'master' of github.com:stuartlynn/youhadmail

Conflicts:
	app/assets/stylesheets/transcribe-tool.css.scss