Xiaomage
good
update
Merge branch 'master' of https://github.com/mark9856/Test

Conflicts:
	test1.cpp