Add a static page controller
Added All
Second Commit
Merge branch 'static-pages'

Conflicts:
	Gemfile.lock