Merge branch 'static-pages' to master
Merge branch 'static-pages'
merge
Revert "Merge branch 'static-pages' to master"
fix issue that was caused by the incorrect merge
This reverts commit 74985e308d0053a2f6a6f32974d7ff29b7667aee.

Conflicts:
	app/controllers/static_pages_controller.rb
	app/views/layouts/application.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb
	spec/spec_helper.rb
Merge branch 'master' into static-pages
merge master branch into static page branch