Merge pull request #1 from alandbarroso/lex

Added makefile and .gitignore
Changed makefile
Change the attribute "token" of State to "name"