added emoticons and corrected description
Merge pull request #1 from mperez4/master

added emoticons and corrected description