Add a StaticPages controller
Finish static pages
Fix the mess around merging and VIM
Merge branch 'static-pages'
Remove parasitic files
Fix ignore git