add 2
Merge branch 'master' of github.com:shengzhong/test

Conflicts:
	myfile