Merge branch 'master' of https://github.com/calimcginley/emo_app

Conflicts:
public_html/index.html