theme
Conflicts:
	_config.yml
	_includes/head.html
	_layouts/post.html