cosas
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/perfil.js
Merge branch 'master' of https://github.com/dsaqp1314g1/spot-project.git

Conflicts:
	www/perfil.js
Cambio posicion depende pantalla spot detail
Merge remote-tracking branch 'origin/master'