Finish layout and routes
Merge branch 'master' of github.com:okashoi/sample_app

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