demasiado enredo
Merge Pinto/master

Conflicts:
	css/style.css
resolvi ssaaa ñelda