Incio de escritura de paper
Merge remote-tracking branch 'origin/master'

Conflicts:
	paper/evo2014.ps