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

Conflicts:
	imie2.txt

o
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART
modif naen
modifie artMerge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART

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

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

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

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

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

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