AAA
Merge branch 'master' of https://github.com/Fandyx/lamar

Conflicts:
	www/css/style.css
	www/images/mapa.png
EEE