Changes to template files
Merge branch 'master' of https://github.com/gavinwye/gavinwye

Conflicts:
	_config.yml <— resolved
	_site/index.html