blog post work
Merge branch 'master' of github.com:typpo/blog

Conflicts:
	source/_posts/2013-10-28-asterank-discover-reaches-100.markdown