my first commit
Merge branch 'master' of github.com:alejandromgk/LexicalAnalizer

Conflicts:
	test