update from sandbox1
Merge branch 'master' of github.com:suXinjke/sandbox

Conflicts:
	main.cpp
update from sandbox 1