MAJ ça marche
Merge branch 'master' of github.com:darkrossi/AOD-TP1

Conflicts:
	altex
	test