g

g
Merge branch 'rich'
Merge branch 'master' of https://github.com/richardtien/Compiler

Conflicts:
	project2/src/MyParser.java