update
Merge branch 'master' of https://github.com/scotfu/parser

Conflicts:
	python/p_flex.py
merge
found bugs