Added coffee mug to sprites
fixed merge conflicts
Merge branch 'master' of https://github.com/ryzdev/AutoBot
Merge branch 'master' of https://github.com/ryzdev/AutoBot
Merge branch 'master' of https://github.com/ryzdev/AutoBot