Add a StaticPages controller
Finish static pages
Merge branch 'master' of https://github.com/shaffer-wv/sample_app

Conflicts:
	.secret