de nuevo

otra vez
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style-page.css
	view/page-comparar.html