All deleted - again
Merge branch 'master' of https://github.com/hkilter/hkilter.github.io

Conflicts:
	_config.yml
	_layouts/default.html
	css/main.css
	index.html
Merge branch 'master' of https://github.com/hkilter/hkilter.github.io