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

Conflicts:
	PolyLib.c
	stratego