Merge branch 'horizontal-scroll' of https://github.com/rossbruniges/CSOL-site
Merge remote-tracking branch 'upstream/master'
adding severely broken version of the badge experience
Fixing the intro quiz
Merge pull request #27 from mozilla/10-andrew

10 andrew