Cambios en el tex
Merge branch 'master' of github.com:geneura-papers/2015-Evostar

Conflicts:
	GPbot/GPbot-evostar2015.tex