master third
feature third

Conflicts:
	README.txt
Merge branch 'feature1' of https://github.com/jlk227/rebasing into feature1

Conflicts:
	README.txt