no message
Merge branch 'master' of https://github.com/jjcao/jjcao_code

Conflicts:
	.gitignore
	delSVN.bat
no message