add some cool stuff
fix something horrible here
Merge branch 'hotfix'
some cool stuff again
Merge branch 'iss53'

Conflicts:
	sample.txt