agregado de setting_local para para gitignore
Merge branch 'master' of https://github.com/antsss/hache-cueros

Conflicts:
	hache-cueros/Maquetado/img/Thumbs.db