Added <type> class and -> shorthand.
Merge branch 'master' of https://github.com/ahaven/6.945-Project

Conflicts:
	types.scm