-Mapa
Merge branch 'master' of https://github.com/aleycris/LugLoc.git

Conflicts:
	www/lugloc.html