partial merge
Continuing to merge branch 'master' of github.com:ermine-language/ermine

Conflicts:
	src/Ermine/Syntax/Head.hs
Fixed Ermine.Inference.Witness, 2 modules remain
instance (Variable t, App (t (Var b (t a))), App (t a)) => App (Scope b t a)
lifted App to higher kind to simplify that last instance!
lifted Fun to higher kind
witness branch finally compiles
Merge branch 'master' of github.com:ermine-language/ermine into witnesses
fixed properties/Inference.hs