chatgotchi
MAJ etat chatgotchi
Merge branch 'master' of https://github.com/flo02/chatgotchi

Conflicts:
	Chatgotchi_Becquet_Kinsemi/EtatChatgotchi.xaml
	Chatgotchi_Becquet_Kinsemi/bin/Debug/Chatgotchi_Becquet_Kinsemi.exe
	Chatgotchi_Becquet_Kinsemi/bin/Debug/Chatgotchi_Becquet_Kinsemi.pdb
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/Chatgotchi_Becquet_Kinsemi.exe
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/Chatgotchi_Becquet_Kinsemi.g.resources
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/Chatgotchi_Becquet_Kinsemi.pdb
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/EtatChatgotchi.g.i.cs