multiple changes
Merge branch 'gh-pages' of https://github.com/designfundi/jekyll into gh-pages

Conflicts:
	_includes/header.html