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

Conflicts:
	source/_posts/2014-07-13-better-code-navigation-on-github.markdown