my file1
Merge branch 'master' of github.com:holyman2k/learn

Conflicts:
	file1