jyy.c
Merge branch 'master' of https://github.com/jiayueyuan/helloword

Conflicts:
	jyy.c
jyy.c