cambiado por sheng

cambiado por sheng
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc sheng.txt
resolv conflic

resolv
sd