Added Contact page
Merge branch 'static-pages'

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

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