louis's quick fix
Merge branch 'master' of https://github.com/allypalanzi/happening
Merge branch 'gh-pages'