Almost done with Friday
Merge branch 'master' of github.com:turingschool/today