vuelta atrás
Merge branch 'master' of https://github.com/nekoligre/proyecto

Conflicts:
	css/estilo.css
	footer.php
	header.php
	nbproject/private/private.xml