footer, main.js changes
fixed merges
Merge branch 'master' of https://github.com/NathanAtkinson/mustache-adventure