test merge
tets commit !
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
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