new changes
mergeging!

Merge branch 'master' of github.com:tawfiqmp/EmoBot