Placeholder en master
placeholder en master
Merge branch 'perfil' of https://github.com/davydorum/carol into perfil

Conflicts:
	fotos/static/css/estilo.css
Iniciado Editar Perfil