Dan MacLean is now an instructor
Merge branch 'master' into badges