maj
Merge branch 'master' of github.com:imie-source/IMIE-WarZone

Conflicts:
	art.txt
	art.txt~
tout est bon
Merge branch 'master' of github.com:imie-source/IMIE-WarZone

Conflicts:
	art.txt
	art.txt~
maj
maj

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

Conflicts:
	art.txt
	art.txt.orig
	art.txt~
maj

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

Conflicts:
	art.txt~
maj allan
Merge branch 'master' of github.com:imie-source/IMIE-WarZone