asdf
Merge branch 'master' of https://github.com/bongtrop/test-merge

Conflicts:
	test.txt