everything works
fixed
Merge branch 'master' of github.com:WillianPaiva/project_AS

Conflicts:
	src/test.y
test