Updating js and css
Merge branch 'master' of https://github.com/paul-musgrave/peppermint