static page
Merge branch 'static-pages'

Conflicts:
	Gemfile.lock