Merge pull request #43 from bhavin192/master

some more small additions for emoticons
Bugfixes
Add kiki.png