Merge pull request #11 from adaptlearning/develop

Develop
Merge pull request #13 from adaptlearning/develop

Develop
Merge branch 'develop'

* develop:
  Fixes #15 Example JSON updates
Merge branch 'master' into develop

* master: