Finish layout and routes
Added working show page
Merge branch 'master' of https://github.com/Lostinthewoodz/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/helpers/application_helper.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/static_pages/contact.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb