Static pages updated
Add a Static Controller
Finish static pages
Merge branch 'static-pages'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/static_pages/help.html.erb
	app/views/static_pages/home.html.erb
	config/routes.rb