Fixes
Merge branch 'master' of github.com:logancollingwood/CMPS104

Conflicts:
	ASG4/astutil.cpp
	ASG4/symboltable.cpp
Removed generated files