Merge pull request #19 from CiaranR/gh-pages

backport
lighter blue
Merge branch 'develop' of https://github.com/CiaranR/diana-and-ciaran into develop

Conflicts:
	_includes/header.html
Merge pull request #20 from CiaranR/develop

Develop