First commit
Merge branch 'master' of github.com:gkuhn1/versioned_text

Conflicts:
	.gitignore
	README.md