actually fixed the secret key
Merge branch 'master' into static-pages
Added a Static Pages controller
Finish static pages