develop update file1
Merge branch 'develop' of https://github.com/github888888/gitdemo into develop

Conflicts:
	file1.txt