Fixing conflict
Conflicts:
	a-sweet-file.txt
Merge pull request #1 from borkweb/thing-branch

Fixing conflict