wip
Merge remote-tracking branch 'nazuki/master'
added new emoji, symlinking is still wip
Merge remote-tracking branch 'upstream/master'
Merge pull request #14 from Kagetsuki/master

Added new emoji and wip symlinking