index on master: 077717f Makefile atualizado
WIP on master: 077717f Makefile atualizado
Merge commit 'stash@{0}'

Conflicts:
	src/Semantics.ml
	src/Syntax.ml