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

Conflicts:
	lib/libwhile/libWhileTest