Merging 13 with 11
Merge branch 'gh-pages' of https://github.com/bjc-nc/bjc-course into gh-pages