Partially debbugded : still some negative numbers, figures not implemented
Merge branch 'master' of https://github.com/epfl-projects/dis-project