emoticons replaced with words
Merge branch 'master' of github.com:sohamde/cl2_project