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

Conflicts:
	spec/spec_helper.rb