parser
Merge branch 'master' of https://github.com/g3org3/lab04

Conflicts:
	scanner/Lab04Scanner.g