Cambios jum?
errores merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
actualizacion formularios
Merge remote-tracking branch 'upstream/master'
merge stilos
merge-borrado dump no se que
Merge pull request #66 from EduardoDiaz/master

add photo
some styles
Merge branch 'master' of github.com:mejorandolaclase/mapa-turistico
Merge pull request #67 from EduardoDiaz/master

add photo
Merge branch 'master' of github.com:mejorandolaclase/mapa-turistico
Merge pull request #68 from EduardoDiaz/master

add ignore uploads
Merge branch 'master' of github.com:mejorandolaclase/mapa-turistico
header
stylus boton de salir
corridos errores
profile
Merge remote-tracking branch 'upstream/master'