?
Merge branch 'master' of github.com:pcouderc/mpri13

Conflicts:
	src/elaboration/elaborateDictionaries.ml