custom.css
routes
Merge branch 'filling-in-layout' of https://github.com/momenian/sample_app into filling-in-layout

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/_footer.html.erb