Merge branch 'master' of https://github.com/foxiu123/test-repo

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'