comment
Merge branch 'source' of github.com:ahao/ahao.github.io into source

Conflicts:
	sass/_base.scss
	sass/base/_layout.scss
	sass/base/_typography.scss
	sass/base/_utilities.scss
	sass/screen.scss
	source/_includes/after_footer.html
	source/_includes/archive_post.html
	source/_includes/article.html
	source/_includes/custom/footer.html
	source/_includes/custom/navigation.html
	source/_includes/footer.html
	source/_includes/google_analytics.html
	source/_includes/head.html
	source/_includes/header.html
	source/_includes/navigation.html
	source/_includes/post/categories.html
	source/_includes/post/sharing.html
	source/_layouts/category_index.html
	source/_layouts/default.html
	source/_layouts/page.html
	source/_layouts/post.html
	source/_posts/2013-04-23-hello-github.markdown
	source/blog/archives/index.html
	source/index.html
	source/javascripts/twitter.js