aO
Merge branch 'master' of https://github.com/guinardA/PolyStrat

Conflicts:
	log.txt
	stratego
modification du temps