lose and restart
Merge remote-tracking branch 'origin/master'
lose
Merge branch 'master' of https://github.com/eicke123/lattegotchi