first commit
add b.txt
first commit
add c.txt
update a.txt from master
Merge branch 'cherrypick'

Conflicts:
	exercises/cherrypick/a.txt