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

Conflicts:
	_posts/2014-06-01-shalemei.md
delete
add new file