2eme commit mach2
Merge branch 'master' of https://github.com/bardiamna/GLTP1

Conflicts:
	hw.sh

commit pour resoudre le conflit (mergetool)