Merge test
Merge branch 'master' of https://github.com/BakDong/Tamagotchi

Conflicts:
	Classes/Tamagotchi.cpp