Merge remote-tracking branch 'Dorkette/gh-pages'
Merge remote-tracking branch 'Dorkette/gh-pages'
Merge remote-tracking branch 'Dorkette/gh-pages'
Merge remote-tracking branch 'Dorkette/gh-pages'
Merge remote-tracking branch 'Dorkette/gh-pages'
Now retrieving static data.json from xhr, major changes to xhr/data.json. Working.
Merge remote-tracking branch 'Dorkette/master' into gh-pages