"grabbing files ashley added"

Merge remote-tracking branch 'upstream/master'
playing around with the json thing
merging it
Merge remote-tracking branch 'upstream/master'
added the slider, the legend, and the quizzess/assignments it's averaging over
Merge pull request #2 from michelleoj/master

played around with the json file