Hype Update
Merge branch 'master' of https://github.com/grierson/grierson.github.io

Conflicts:
	_config.yml