fixing errors
correcting conflicts
Merge branch 'master' of https://github.com/fsoller/compiladores