merge conflicts
Merge branch 'gh-pages' of https://github.com/cpjobling/EG-247-Resources into gh-pages
regenerate week6 slides after merge conflict