sources
update
update
update
Update _config.yml
Update _config.yml
form input style
discard webfont
discard webfont
update webfont
update webfont
update theme
update theme
update theme
post add
放错地方了
update
update
update img style
Merge remote-tracking branch 'ihavee/master'

Conflicts:
	404.html
	README.md
	Rakefile
	_config.yml
	_includes/JB/analytics
	_includes/JB/comments
	_includes/JB/sharing
	_includes/custom/aside
	_includes/custom/asides/blogroll
	_includes/custom/asides/recently_comments
	_includes/custom/asides/recently_posts
	_includes/custom/asides/recently_visitors
	_includes/custom/comments
	_includes/custom/sharing
	_includes/themes/havee/default.html
	_includes/themes/havee/page.html
	_includes/themes/havee/post.html
	archive.html
	assets/themes/havee/_sass/_base.scss
	assets/themes/havee/_sass/_custom.scss
	assets/themes/havee/_sass/style.scss
	assets/themes/havee/css/pygments.css
	assets/themes/havee/css/style.css
	assets/themes/havee/js/bootstrap.min.js
	assets/themes/havee/js/webcore.js
	atom.xml
	categories.html
	index.html
	pages.html
	robots.txt
	rss.xml
	sitemap.xml
	tags.html