1st rebase

new comment!
Merge pull request #1 from TheM0ng00se/smiley-faces

This was to add the smiley faces as part of a feature request from users