change
Merge branch 'master' of https://github.com/hjp4lucifer/git_test

Conflicts:
	addFile.txt
Merge branch 'master' of https://github.com/hjp4lucifer/git_test
xxxx
Merge branch 'master' of https://github.com/hjp4lucifer/git_test
s
Merge branch 'master' of https://github.com/hjp4lucifer/git_test
fix
Merge branch 'master' of https://github.com/hjp4lucifer/git_test