Práctica 10 Reeditada
Merge remote-tracking branch 'origin/master' into HEAD

Conflicts:
	addphoto.php
	crearalbum.php
	css/style.css
	detailPicture.php
	detailalbum.php
	index.php
	profile.php
	register.php
	searchPro.php
	searchResults.php