add test json
Merge branch 'master' of https://github.com/shufenghua/JF
change test.json
Merge remote-tracking branch 'JF/master'

Conflicts:
	test.json