[minor] post update
Merge branch 'work' of github.com:Plou/blog into work

Conflicts:
	app/_posts/2013-10-20-column-manager.md