Merge branch 'master' of https://github.com/TJDevClub/Intermediate-Week-1