cambios
xcvxcvx
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter

Conflicts:
	principal/models.py
xfbdh
cambios
Creacion de listaTesoros, crearTesoro y BorrarTesoro. Comprobar si funcionan realmente. Yo no he podido acceder a la pestaña de tesoros
gfgf
Merge branch 'TakaraHunterAlf'
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter
Ya funciona el mapa
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter
Merge branch 'master' into PetterKunBRANCH
Tesoros solo visibles por el admin, tenia lio xD
gestion de tesoros ndhdfsfsdjks
Merge branch 'TakaraHunterAlf'
mejorando rutas