theme cloned
-merge conflicted
Merge branch 'master' of https://github.com/geekmyo/herring-cove

Conflicts:
	.gitignore
	_config.yml
	_includes/footer.html
	_includes/header.html
	_layouts/default.html
	_layouts/post.html
	index.html