Merge branch 'master' into develop
cambio de mapa
ajustes de mapa + parallax
Merge branch 'develop'

Conflicts:
	style.css