fixed
Merge branch 'master' of https://github.com/sa-spag/acc

Conflicts:
	fsm.h
	parserutils.c