modify file1
Merge branch 'master' of github.com:albertshen/workshop

Conflicts:
	file1