Initial commit
Merge branch 'master' of https://github.com/cj709test2/cjtest2

Conflicts:
	README.md
local 6