json
cargas.js
commit del mal
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam

Conflicts:
	ALMA_PROJECT/www/js/cargas.js
Método ubicar antenas
Merge branch 'master' of https://github.com/zerotb/spaceapps_araucateam