bug fix
Merge branch 'master' of github.com:eicke123/lattegotchi