hocho

added blade, cutlery
more keywords

sushi, shower, newspaper, no_bell, womens, slot_machine,
small_blue_diamond
Merge branch 'gh-pages' of https://github.com/zuzzzz/emoji into zuzzzz-gh-pages

Conflicts:
	emojis.json
Fix test failure :rotating_light:
Merge branch 'zuzzzz-gh-pages' into gh-pages
Merge branch 'gh-pages' of https://github.com/DeonHua/emoji into DeonHua-gh-pages
Adds the 'birthday' keyword to the following emoji:

* :balloon:
* :confetti_ball:
* :tada:
Fix unresolved merge conflicts
Merge branch 'DeonHua-gh-pages' into gh-pages
:eyes:
Merge pull request #104 from davefp/birthday_party

Adds the 'birthday' keyword to the following emoji:
:hammer:
Merge pull request #1 from muan/gh-pages

Update.