test commit from webstorm 2
Merge branch 'master' of https://github.com/foxiu123/test-repo

Conflicts:
	README.md