Previous changes
merge conflict
Merge branch 'gh-pages' of github.com:WavesofChange/woc-jekyll into gh-pages