updated a couple of things
merge it

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