modify file4
add file5
Merge branch 'master' of github.com:guiguanLin/git-test

Conflicts:
	file4