Finish static pages
Merge branch 'master' of https://github.com/colinthompson/sample_app

Conflicts:
	app/views/static_pages/home.html.erb