Work for week2
Merge branch 'master' of https://github.com/Greenjam94/tc349