maj diagramme sequence pac gomme
maj diagramme seq pategomme
maj diagramme metier
ggg
Merge branch 'master' of https://github.com/M1INFO-GB/PacMan

Conflicts:
	AnalyseFonctionelle/modele_metier.odt
	Annexes/annexes.odt
	Application/appli_map_OK/Application/pacman/gui/mainwindow.cpp
	Application/appli_map_OK/Application/pacman/gui/mainwindow.h
	Application/appli_map_OK/Application/pacman/gui/mainwindow.ui
	Application/appli_map_OK/Application/pacman/map/map1.csv
	Application/appli_map_OK/Application/pacman/pacman.pro
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/game.cpp
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/game.h
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/pacman.cpp
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/pacman.h
	Application/appli_map_OK/Application/pacman/prototype/fantomme/ghost.cpp
	Application/appli_map_OK/Application/pacman/prototype/fantomme/ghost.h
	Application/appli_map_OK/Application/pacman/prototype/map/map.cpp
	Application/appli_map_OK/Application/pacman/prototype/map/map.h
	Application/appli_map_OK/Application/pacman/prototype/patteGomme/pacGomme.cpp
	Application/appli_map_OK/Application/pacman/prototype/patteGomme/pacGomme.h
	Application/appli_map_OK/Application/pacman/ressources.qrc
	Application/pacman/config/config.cpp
	Application/pacman/gui/mainwindow.cpp
	Application/pacman/pacman.pro
	Application/pacman/partie/partiesolo.h
	Application/pacman/prototype/deplacerPacman/game.cpp
	Application/pacman/prototype/deplacerPacman/game.h
	Application/pacman/prototype/deplacerPacman/pacman.cpp
	Application/pacman/prototype/deplacerPacman/pacman.h
	Application/pacman/prototype/map/map.cpp
	Application/pacman/prototype/map/map.h
	Application/pacman/prototype/patteGomme/pacGomme.cpp~HEAD
	Application/pacman/prototype/patteGomme/pacGomme.h
	ComptesRendus/CRE1/GL-Projet3PacMan-GrpB-CRE1v1-0Valide.odt
	ComptesRendus/CRE4/GL-Projet3PacMan-GrpB-CRE4V4.odt
	ComptesRendus/CRI2/GL-Projet3PacMan-GrpB-CRI2v1-0.odt
	ComptesRendus/CRI3/GL-Projet3PacMan-GrpB-CRI3v3-0.odt
	ComptesRendus/CRI4/GL-Projet3PacMan-GrpB-CRI4V4-1.odt
	Planification/3/Iteration3planification.odt
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/deplacerPacManInMap.pro
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/game.cpp
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/game.h
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/map.cpp
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/pacman.cpp
	PrototypesTechniques/DeplacerPacManInMap/deplacerPacManInMap/pacman.h
	PrototypesTechniques/protoPatGomme/images/pacclose.png
	PrototypesTechniques/protoPatGomme/images/pacclose.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacclose.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacclosed.png
	PrototypesTechniques/protoPatGomme/images/pacclosed.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacclosed.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacclosel.png
	PrototypesTechniques/protoPatGomme/images/pacclosel.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacclosel.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/paccloseu.png
	PrototypesTechniques/protoPatGomme/images/paccloseu.png~HEAD
	PrototypesTechniques/protoPatGomme/images/paccloseu.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen1.png
	PrototypesTechniques/protoPatGomme/images/pacopen1.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen1.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen1d.png
	PrototypesTechniques/protoPatGomme/images/pacopen1d.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen1d.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen1l.png
	PrototypesTechniques/protoPatGomme/images/pacopen1l.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen1l.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen1u.png
	PrototypesTechniques/protoPatGomme/images/pacopen1u.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen1u.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen2.png
	PrototypesTechniques/protoPatGomme/images/pacopen2.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen2.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen2d.png
	PrototypesTechniques/protoPatGomme/images/pacopen2d.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen2d.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen2l.png
	PrototypesTechniques/protoPatGomme/images/pacopen2l.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen2l.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen2u.png
	PrototypesTechniques/protoPatGomme/images/pacopen2u.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen2u.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen3.png
	PrototypesTechniques/protoPatGomme/images/pacopen3.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen3.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen3d.png
	PrototypesTechniques/protoPatGomme/images/pacopen3d.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen3d.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen3l.png
	PrototypesTechniques/protoPatGomme/images/pacopen3l.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen3l.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/images/pacopen3u.png
	PrototypesTechniques/protoPatGomme/images/pacopen3u.png~HEAD
	PrototypesTechniques/protoPatGomme/images/pacopen3u.png~a63cd0880799f64399aeef9180211373cb0dae22
	PrototypesTechniques/protoPatGomme/pacGomme.cpp
	PrototypesTechniques/realGOMME/images/pacclose.png
	PrototypesTechniques/realGOMME/images/pacclosed.png
	PrototypesTechniques/realGOMME/images/pacclosel.png
	PrototypesTechniques/realGOMME/images/paccloseu.png
	PrototypesTechniques/realGOMME/images/pacopen1.png
	PrototypesTechniques/realGOMME/images/pacopen1d.png
	PrototypesTechniques/realGOMME/images/pacopen1l.png
	PrototypesTechniques/realGOMME/images/pacopen1u.png
	PrototypesTechniques/realGOMME/images/pacopen2.png
	PrototypesTechniques/realGOMME/images/pacopen2d.png
	PrototypesTechniques/realGOMME/images/pacopen2l.png
	PrototypesTechniques/realGOMME/images/pacopen2u.png
	PrototypesTechniques/realGOMME/images/pacopen3.png
	PrototypesTechniques/realGOMME/images/pacopen3d.png
	PrototypesTechniques/realGOMME/images/pacopen3l.png
	PrototypesTechniques/realGOMME/images/pacopen3u.png
	PrototypesTechniques/realGOMME/realPacGomme/pacGomme.cpp
	Rapport/en_tete_rapport.odt
	Specifications/analyse_des_besoins.odt