merge
Merge branch 'master' of https://github.com/julianaleon8/IA2_2014

Conflicts:
	pruebaLocal/main.cpp