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

Conflicts:
	.idea/workspace.xml
	spec/requests/static_pages_spec.rb