Merge pull request #1 from turingschool/master

update
Merge pull request #125 from GusVilla303/master

Merge pull request #1 from turingschool/master