emotions ready
Merge branch 'master' of https://github.com/Forwaistee/JBdiEmo-the-game