Merge pull request #1 from michelleoj/master

added the json file that's accessible w/o all the hassle
changes in html
Merge branch 'master' of https://github.com/socho/edx
deleted my exercise html
updated bootstrap to new version and setup basic layout
merging it
Merge remote-tracking branch 'upstream/master'
added the slider, the legend, and the quizzess/assignments it's averaging over