Update file4
Merge branch 'master' of https://github.com/ycui/test_repo

Conflicts:
	file4
Merged with origin/master.

conflic found in file4. Used the version in the remote.