commit
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART

Conflicts:
	imie.txt
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART

Conflicts:
	imie.txt
resolution de conflit

Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART

Conflicts:
	imie.txt
test merge

Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART

Conflicts:
	imie.txt
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART
test pour merge