commit do spoonknif1.txt
Merge branch 'mybranch'

Conflicts:
	spoonknife1.txt