Completed Week 1: Step 1.
Merge remote-tracking branch 'origin/master'