Remove unnecessary link
Merge branch 'master' into footnotes

Conflicts:
	_posts/2013-08-14-what-does-zbb-mean.md