Commit antes de hacer pull
Merge branch 'master' of github.com:joseluisjb1990/Heisenberg

Conflicts:
	src/generator.cc