fixed warnings
Merge https://github.com/dpanayotov/Tamagotchi