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

Conflicts:
	.DS_Store
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/support/utilities.rb