b
bMerge branch 'master' of github.com:Plou/plou.github.io

Conflicts:
	code/2013/10/05/jfinder/index.html
	code/2013/10/20/column-manager/index.html
	css/6b28.main.css
	css/78cf.main.css
	css/adff.main.css
	default/2013/09/01/hi-there/index.html
	demo/assets/columnManager/columnManager.js
	demo/assets/columnManager/columnManager.map
	demo/assets/columnManager/columnManager.src.coffee
	demo/assets/columnManager/jquery.js
	demo/assets/columnManager/jquery.min.js
	demo/assets/columnManager/jquery.min.map
	demo/columnManager/index.html
	demo/solarClock/index.html
	index.html
	js/1b94.script.js
	js/1ff9.script.js
	js/dfaa.script.js