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

Conflicts:
	.cache
	src/syntax/Types.scala