Merge branch 'master' of github.com:/TeamBN/ppe_auto_ecole

Conflicts:
	fichier.txt

Signed-off-by: chocoow <darid.jeremy@gmail.com>
Merge branch 'master' of github.com:/TeamBN/ppe_auto_ecole
Merge branch 'master' of github.com:/TeamBN/ppe_auto_ecole