Added different json, and added functions to load it.
Merge branch 'origin/gh-pages'