merging
bug fixing
Merge branch 'master' of https://github.com/fsoller/compiladores

Conflicts:
	src/semantics.c