Finally pushing code from week 3
Merge remote-tracking branch 'origin/master'