Getting ready to pull.
Merge branch 'master' of
https://github.com/currysensei/cool-compiler.git

Conflicts:
	src/edu/icom4029/cool/parser/Parser.java
	src/edu/icom4029/cool/parser/TokenConstants.java