Class Vars and Functions added to Context.
Merge branch 'master' of https://github.com/nbsdx/CSSE404_Compilers

Conflicts:
	src/parse/typecheck.cpp
finished fixing merge shit