commit voor merge
Merge branch 'master' of https://github.com/dmerckx/cpl

Conflicts:
	src/syntax/Syntax.scala