jai ajouter le unit guerrier
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration

Conflicts:
	modele_client.py
la jai vraiement ajouter guerrier avant de perdre mon code
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration
Merge branch 'integration' of https://github.com/gabc/cegepofempire into integration