Finish static pages
Merge branch 'static-pages'

Conflicts:
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	app/views/static_pages/about.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb