sixth commit
Merge branch 'master' of https://github.com/frankliuyj/testgit

Conflicts:
	first.txt