cambios menores
Merge branch 'master' of github.com:jhhernandez/SI

Conflicts:
	src/model/agents/MainAgent.cpp
Merge branch 'master' of github.com:jhhernandez/SI
arreglado A* DEFINITIVO