ultima

por favor terminemos yaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/page-comparar.html