what a fine update
Merge branch 'master' into super-update
can you get a joke?
Merge branch 'damijanm-super-update'

Conflicts:
	stuff.txt
Merge branch 'master' of github.com:lornajane/demo-repo