substitution now contains all points of annotation.

Not only varialbles.
Preparing to pull master branch from remote
added some tests and comments
Updated testing functionality to use exp.ml
Added test to testing
Merge remote-tracking branch 'origin/typing' into typing

(with conflicts)

Conflicts:
	src/typing.ml
Added simple kinds, changed kinds type to (char * string list) list
Preparing to checkout master
Added rings, altered the format of kinds
fixed some comments.
Merge branch 'typing+parsing' into typing
adopted typing to ast changes.

I have a deja vu, as I've already fixed this...