patrick
Merge branch 'master' of https://github.com/imie-source/TP-initiation
patrick
Conflicts:
	ASCII1
patrick
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII1
	ASCII2
Merge branch 'master' of https://github.com/imie-source/TP-initiation
patrick
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII2
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII1
	ASCII2
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII2
Merge branch 'master' of https://github.com/imie-source/TP-initiation

Conflicts:
	ASCII1