updated post links
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-08-18-hacker-school-week-10.md