type system: first implementation success
Merge branch 'typesystem'

Conflicts:
	src/main/scala/grapevineType/GrapevineType.scala