finish layout and routes
Merge branch 'master' of github.com:grstk/sample_app

Conflicts:
	spec/requests/static_pages_spec.rb