mise a jour diagramme
Merge branch 'master' of https://github.com/Melyre/Projet-Tamagoshi
ajout makefile et modif GUI.cpp
Merge branch 'master' of https://github.com/Melyre/Projet-Tamagoshi
Merge branch 'master' of https://github.com/Melyre/Projet-Tamagoshi
makefile