lexer
Merge branch 'master' of github.com:foones/dharma

Conflicts:
	funcional/lexer.c