Merge branch 'master' of github.com:patbl/ea-skillshare