pushing and pulling updates from ryan
stashing old files for updates
merging all changes to local
mergeging!

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