hmmm
Merge branch 'master' of https://github.com/zmeda/energyhackb.tamagotchi

Conflicts:
	retrieve.py