Finished layout and routes
Merge branch 'static-pages'

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/custom.css.scss
	app/helpers/application_helper.rb
	app/views/static_pages/home.html.erb
	config/routes.rb
Merge branch 'master' of github.com:mcw23/sample_app

Conflicts:
	Gemfile
	Gemfile.lock