change
Merge branch 'master' of github.com:krueger/git_sandbox

Conflicts:
	test.txt