resolve conflict
Merge branch 'master' of https://github.com/BigPolarBear/try_git

Conflicts:
	test.txt