edit
Merge branch 'master' of https://github.com/SilunWang/CoffeeCompiler

Conflicts:
	grammar.js