Finish static pages
Merge branch 'master' of https://github.com/anna2/sample_app

Conflicts:
	app/controllers/static_pages_controller.rb
	config/routes.rb
	spec/requests/static_pages_spec.rb