updated main from sandbox 2
updated main from sandbox 2
Merge branch 'master' of github.com:suXinjke/sandbox

Conflicts:
	main.cpp