Added some keywords.
Fixed keywords in "crown"
Merge branch 'gh-pages' of https://github.com/kokhouser/emoji into kokhouser-gh-pages

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