gh-pages
version pour devoxxfr 2013
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	css/custom.css
	js/controllers.js
Merge branch 'master', remote-tracking branch 'origin' into gh-pages
Merge branch 'master' into gh-pages

Conflicts:
	js/controllers.js
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
add a slide on industrialisation