Merge branch 'static-pages'
updated home, help, controller and routres
Merge branch 'master' into static-pages

Conflicts:
	app/views/static_pages/about.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	spec/requests/static_pages_spec.rb