fix error bug
Merge branch 'master' of https://github.com/miketonson/my_cmm_complier

Conflicts:
	compiler1/parser