update
Merge branch 'master' of github.com:wuzw/test

Conflicts:
	main.cpp