cambios en galeria
Merge branch 'master' of https://github.com/patolinlp/Whouse

Conflicts:
	index.html
	php/galeria.php