Cambios
Merge branch 'master' of github.com:nesmaster/sionca

Conflicts:
	copysion.log
	copysionF.txt
Cambios