now edit from GitHub

git-tfs-id: [http://csmwebstage:8080/tfs/WebDevelopment]$/SocrataOpenData/SODA/TestGitTfs;C2068
edit readme

git-tfs-id: [http://csmwebstage:8080/tfs/WebDevelopment]$/SocrataOpenData/SODA/TestGitTfs;C2069
Merge branch 'master' of github.com:thekaveman/TestGitTfs

Conflicts:
	README.md