test
Merge branch 'master' of https://github.com/lizhizhou/IO26

Conflicts:
	main.c