merge with tfs and github
merge git and git tf
Merge branch 'master' of https://github.com/chadit/TestingDemo