Animation "Border"
Merge branch 'master' of https://github.com/Yakka/tamagochi

Conflicts:
	Game/data.txt
Gain d'argent
Prix des cadeaux et gain d'argent
Liste polish des objets
Merge branch 'master' of https://github.com/Yakka/tamagochi

Conflicts:
	Game/GiftButton.pde
	Game/data.txt
Phrases à la con
Dialogue lol