mknnklh
Merge branch 'master' of https://github.com/PetterKun/appTakaraHunter
l
Conflicts:
	www/index.html
	www/js/index.js
	www/js/mapas.js
Merge branch 'master' of https://github.com/PetterKun/appTakaraHunter
cambios
Conflicts:
	www/index.html
	www/js/index.js
basura
FUNCIONA LOGIN EN MOVIL
FUNCIONAN MAPAS
MAPA FUNCIONANDO (V2)
Merge branch 'ElolawynUbuntu'

Conflicts:
	www/index.html
	www/js/config.js
mejoras