New
Merge github.com:ZhaoCJ/TestGitHub

Conflicts:
	.gitignore