some changes that need to be unchanged
okMerge branch 'master' of github.com:tawfiqmp/EmoBot
whatever