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
minimum viable solution to #20
Merge pull request #29 from cmcavoy/20-add-vimeo

minimum viable solution to #20
added student and parent signups, still needs some design TLC and the emails to be confirmed #28
Merge pull request #31 from cmcavoy/28-wire-email

added student and parent signups, still needs some design TLC and the em...
adding titles back in so that they show up on hover
making paths not based off root
missed one
hiding the email sign up forms
adding missing image
updated copy for badge quiz
more small changes
adding path to chicago themed badge
adding additional logos fixes #13
updated copy fixes #4
update to copy fixes #33