Merge pull request #1 from turingschool/master

update