Fichier de test
Merge branch 'master' of https://github.com/statick33/LOG430_LAB3

Conflicts:
	datain.txt