fondu enchaine
Merge branch 'master' of https://github.com/timalengreau/projet-info-2014

Conflicts:
	code.oz