Abuguet Stylings
Merge branch 'master' of https://github.com/discourse/discourse

Conflicts:
	Gemfile
	app/assets/images/d-logo-sketch.png
	app/assets/stylesheets/application/modal.css.scss