Cambios jum?
errores merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
deploy heroku
add procfile heroku
config
add url for get profile
actualizacion formularios
Merge remote-tracking branch 'upstream/master'
merge
conflicto resuelto
add save image
merge stilos
merge-borrado dump no se que
add upload photo and places
Merge pull request #66 from EduardoDiaz/master

add photo
some styles
Merge branch 'master' of github.com:mejorandolaclase/mapa-turistico
add photo and static file test