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

Conflicts:
	spec/requests/static_pages_spec.rb
	spec/support/utilities.rb