Fix bug.
Merge branch 'master' of github.com:gdotdesign/tamagochi
Icons.
Merge branch 'master' of github.com:gdotdesign/tamagochi