kymogram/Projet-d-annee — pull request #2 by RobinPetit (2014-12-14 12:41:02+00:00)
Title: Code has been corrected and optimized (2nd try)

fixed merge conflicts !