u mad ?
before merge
first !
:o
Merge branch 'master' of github.com:imie-source/IMIE-ASCIIART

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

Conflicts:
	imie.txt