Conflicting commit
Merge branch 'gh-pages' of https://github.com/wearecircuit/www-jekyll into gh-pages

Conflicts:
	README.md