JM's Change
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII1
JM's Conflict1
Merge branch 'master' of https://github.com/imie-source/TP-initiation
Conflict2 JM's
Conflicts:
	ASCII1
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII1
jm-conflict 4
jm CHANGE
Merge branch 'master' of https://github.com/imie-source/TP-initiation
Conflicts:
	ASCII1
	ASCII2
JM last