changed head back to before rebase
Merge branch 'samplebranch' of github.com:robinvdijk/gitrebase into samplebranch

Conflicts:
	file.txt