update of lexing. correct implementation
Merge branch 'master' of https://github.com/omnigoat/rose

Conflicts:
	src/main.cpp