arreglado
Merge branch 'master' of https://github.com/nekoligre/proyecto

Conflicts:
	.htaccess
	nbproject/private/private.xml