update
Merge https://github.com/jensyn/cs-xiyoulinux

Conflicts:
	README.md