Debugging...
Merge branch 'master' of https://github.com/noKid/esir2comp

Conflicts:
	simple.cpp
	src/analyze/WhileLexer.java
	src/analyze/WhileParser.java
	src/analyze/WhileTree.java
	whc.jar