Meep
Merge branch 'master' of
https://github.com/currysensei/cool-compiler.git

Conflicts:
	src/edu/icom4029/cool/lexer/Lexer.java
	src/edu/icom4029/cool/parser/Parser.java
	src/edu/icom4029/cool/parser/TokenConstants.java
m
Merge branch 'master' of https://github.com/currysensei/cool-compiler.git
Linted and commented some stuff while studying the code.