change config
delete _site
Merge branch 'master' of github.com:subler/subler.github.io

Conflicts:
	_config.yml
	_site/categorys/神器.html
	_site/index.html