working thru ch5 railstutorial, up to custom.css.scss
up to 5.2 of the rails tutorial
Merge branch 'getting-started'