addfile
Merge branch 'Lei.meng'
Merge branch 'master' of https://github.com/ChaosLin/TestProject

Conflicts:
	.gitignore