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

Conflicts:
	css/main.css