initial commit; add readme (again)
changed readme
changed readme in master
new-index commit 2
Merge branch 'new-index'

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/ndmason1/TestRepo