develop on branch "dev"
Merge branch 'master' of github.com:ncicheng/myHub

Conflicts:
	test.txt