dev commit
dev commit
Some Dev changes
Merge branch 'dev' of github.com:wanghh00/TestRepo into dev

Conflicts:
	README.md
Merge branch 'master' into dev
new dev note