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

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

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

Conflicts:
	art
Merge branch 'master' of http://github.com/imie-source/IMIE-ASCIIART
essai
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