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

Conflicts:
	principal/models.py
xfbdh
cambios
Ya funciona el mapa
Merge branch 'master' of https://github.com/jesusnoseq/TakaraHunter
Merge branch 'master' into PetterKunBRANCH
Merge branch 'TakaraHunterAlf'