Merge branch 'mod-8'
Merge branch 'master' of github.com:stefanosc/myflix