testt
Merge branch 'master' of https://github.com/pvuillemin/ProjetBenabouVuillemin

Conflicts:
	testt/testt.layout
delete
Merge branch 'master' of https://github.com/pvuillemin/ProjetBenabouVuillemin
Merge branch 'master' of https://github.com/pvuillemin/ProjetBenabouVuillemin