create about page
Merge remote-tracking branch 'origin/static-pages'

Conflicts:
	app/controllers/static_pages_controller.rb
	app/views/static_pages/about.html.erb
	spec/requests/static_pages_spec.rb