Nettoyage local
mise a jours question + cours
Merge branch 'master' of https://github.com/sdaher/isepse2014 into sdaher-master
Merge branch 'sdaher-master'

Conflicts: