locales
Merge branch 'master' of https://github.com/Tasel125/prueba_009

Conflicts:
	doc.txt