adding untracked files
Finished up the static pages
Merge branch 'static-pages'