arrumando alguns detalhes
Merge branch 'master' of https://github.com/gdelavald/Compiladores-2014-1

Conflicts:
	src/main.c