Add a StaticPages controller
update
test commit to static
Finish static pages
commit changes
commit changes
Merge branch 'static-pages'

Conflicts:
	.idea/workspace.xml