commit trigger by visual studio
trigger by tortoisegit
Merge branch 'master' of github.com:rogerluo/cbtestcpp

Conflicts:
	CBTestFirst.layout
	readme.txt