haml
add StaticPages controller
finish static pages
Merge branch 'static-pages'

Conflicts:
	Gemfile
	Gemfile.lock