Before merge with icon fixed version
Merge branch 'master' of https://github.com/zifeishan/emotif
All bug fixed for Week 6 grading