Fixed mugs stuff
Merge branch 'master' of https://github.com/haswalt/JosHappySuperFunTimeSofaCatchyGame