small mountain for footer
fix merge conflict
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages

need to push updates and ensure files are the same
merged and removed some files to match master
Merge branch 'master' into gh-pages