Final
Merge branch 'master' of https://github.com/etienneSG/CERMICS-2014_Presentation