Added new types to tree. Modified isEquivalent and isAssignable in Type.java.
Merge branch 'master' of git://github.com/kalvinnchau/cse131

Conflicts:
	src/VoidType.java