commit workspace.xml
Merge branch 'master' of https://github.com/lhlPersonal/testGit

Conflicts:
	.idea/workspace.xml