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