Add a StaticPages controller
Finish static pages
Merge branch 'static-pages'

Conflicts:
	app/models/user.rb
	config/routes.rb