Merging.
Merge branch 'master' of https://github.com/germanoa/compiladores
Resolvendo conflitos shift/reduce no if-then.