testing detached HEAD
messing up some stuff
Merge branch 'a-branch'

Conflicts:
	README.md