Sales pitch for text files
Merge branch 'master' into feature/bar

Conflicts:
	bar.txt
Merge pull request #2 from aebrett/feature/bar

Feature/bar