Lesson 7 - resources
Merge remote-tracking branch 'upstream/master'