Arreglad0
linea a pruebas
Fixed conflictMerge branch 'master' of https://github.com/palmagro/pancolen

Conflicts:
	pruebas.txt