Merge remote-tracking branch 'origin/testing1-1' into testing1-1

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

Conflicts:
	README.md
local edit testin1-1 first
Merge branch 'master' of https://github.com/ZackCaoEsna/PlayGit into testing1-1

Conflicts:
	README.md
Merge remote-tracking branch 'origin/testing1-1' into testing1-1

Conflicts:
	README.md
merge