merge
Merge branch 'master' of github.com:imie-source/IMIE-POEC-CadavreExquis

Conflicts:
	histoire_2.txt