Beautify
Merge branch 'master' of https://github.com/calblueprint/roots-of-success into ethan/headers

Conflicts:
	app/views/learning_modules/edit.html.slim
More beautify
Merge pull request #73 from calblueprint/ethan/headers

Ethan/headers