Finishing 1407 conversation
Merge branch 'master' of github.com:turingschool/today