BACK@2NORMAL
Merge branch 'kevin'

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