Fixed #2
Merge branch 'master' of https://github.com/jcarpio/tesis

Conflicts:
	pdf/evolving.pdf