garzgul/carpediem — pull request #102 by garzgul (2014-09-17 17:17:21+00:00)
Title: merge mercredi soir week 2

Conflicts:
src/java/servlet/Controleur.java