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

Conflicts:
	src/handling/Handler.scala
extra add operaties
Merge branch 'master' of https://github.com/dmerckx/cpl.git

Conflicts:
	src/parser/Parser.scala
	src/parser/Tests.scala
	src/syntax/Types.scala
merge commit