Fuck yeah!
Merge branch 'master' of github.com:nguyentito/mlpp

Conflicts:
	src/common/positions.ml
	src/elaboration/elaborateDictionaries.ml