Detalles pequeños
Merge branch 'master' of github.com:joseluisjb1990/Bear

Conflicts:
	src/definition.cc
	src/statement.cc