haciendo merge
Merge branch 'master' of https://github.com/leo7r/Inteligencia-Artificial

Conflicts:
	heuristic.hh
merge