Merge branch 'master' of github.com:stewsmith/social_courses