Add .settings to gitignore
Merge branch 'gh-pages' of https://github.com/binout/devoxxfr-2013 into gh-pages
Merge from binout

Display several speakers in talk page
Display all the speakers for a talk
Merge from binout
fix merge issue
Merge pull request #6 from nicolasbacot/gh-pages

Display all the speakers on the talk page