maj appli
maj appli
maj appli
Merge branch 'master' of github.com:M1INFO-GB/PacMan

Conflicts:
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/game.cpp
	Application/appli_map_OK/Application/pacman/prototype/deplacerPacman/pacman.cpp