Adding Emotion
Merge pull request #2 from tiennb/master

Adding Emotion