Added a line for purposes of seeing merge problems
Merge branch 'master' of https://github.com/edjoesu/scraping-intro
Automerged changes and and modified the Kayla line