new text file created
Merge branch 'master' of https://github.com/erzk/testrepo

Conflicts:
	index.md