Again changed new file
Merge branch 'master' of https://github.com/yuefei-zhu/Test into develop

Conflicts:
	newfile