Avance en la generacion de codigo final
Merge branch 'master' of github.com:joseluisjb1990/Heisenberg

Conflicts:
	src/quad.cc
	src/quad.hh