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

Conflicts:
	Chatgotchi_Becquet_Kinsemi.suo
	Chatgotchi_Becquet_Kinsemi/obj/x86/Debug/Chatgotchi_Becquet_Kinsemi.pdb