json added
Merge pull request #2 from corinnecurcie/master

json added