working on making expressions work; good progress so far!
Merge branch 'master' of https://github.com/person594/cs153

Conflicts:
	scc1401/src/compiler/small_c.jjt