David le 02 sept 2013
David le 02/09

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

Conflicts:
	art
David
Conflicts:
	art
David le 03/09
David

Conflicts:
	art