Added a StaticPages controller
finish static pages
finish static pages
getting latest
DS_Store crap
merging
Merge branch 'static-pages'

Conflicts:
	.DS_Store