buhui
Merge branch 'master' of https://github.com/Tarry2012/xiyou

Conflicts:
	1.c