change
Merge branch 'master' of https://github.com/foio/hpstr-jekyll-theme
change
Merge branch 'master' of https://github.com/foio/hpstr-jekyll-theme
Merge branch 'master' of https://github.com/foio/hpstr-jekyll-theme
change
delete.Merge branch 'master' of https://github.com/foio/hpstr-jekyll-theme

Conflicts:
	_posts/2014-07-01-readlist.md
Merge branch 'master' of https://github.com/foio/hpstr-jekyll-theme