base
rm
Merge branch 'gh-pages' of github.com:fish267/blog into gh-pages

Conflicts:
	_config.yml