Funcionando
juntei
Merge branch 'master' of https://github.com/rafadalibera/projeto1

Conflicts:
	.gitignore
	parser.h
	parser.o
	scanner.c