merge conflict
final student edit
Merge branch 'gh-pages' of github.com:WavesofChange/woc-jekyll into gh-pages