Global Vars
Merge branch 'master' into kevin
Committing
Merge branch 'kevin'

Conflicts:
	project2/src/MyParser.java
Merge branch 'master' into rich

Conflicts:
	project2/src/MyParser.java