Adding sass
Merge branch 'master' of https://github.com/thomasnelson4/thoughtbot

Conflicts:
	css/app.scss