Create baz.txt
Merge branch 'feature-2' of github.com:mvhenderson/practice into f2

Conflicts:
	baz.txt