add json
Merge pull request #1 from xuechong87/master

addjson