Derp classroom B
Merge branch 'master' of github.com:turingschool/today
Merging Rachel's edits