Update emojis.json
Merge branch 'gh-pages' of https://github.com/deaneigenmann/emoji into deaneigenmann-gh-pages

Conflicts:
	emojis.json
Merge branch 'deaneigenmann-gh-pages' into gh-pages