ok
ok
ok

Merge branch 'master' of https://github.com/MFlores2021/DMap

Conflicts:
	src/dmap.js
listo