adding the first sprinkling of jsonschema
fixing minor merge conflict
Merge pull request #215 from zinic/master

Adding JSON Schema