Added data.json and function to load it. Various tweaks to css and html
Merge remote-tracking branch 'origin/workingBranch' into gh-pages