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

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