Finish static pages
add contact page
Merge branch 'master' of github.com:golubitsky/sample_app

Conflicts:
	config/routes.rb
	spec/requests/static_pages_spec.rb

"chapter 3 merge"