fruit 2
fruit 3
Merge branch 'mike' of https://github.com/mvhenderson/practice

Conflicts:
	file-a.txt