Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/others/2013-03-20-todos.md
	_posts/programming/2013-08-26-pack-problem.md
Merge remote-tracking branch 'origin/master'