Commit message
Merge branch 'master' of https://github.com/chenchiaying/mytest

Conflicts:
	NCLscan