Corrected model, without negative numbers, still need some adaptations
Merge branch 'master' of https://github.com/epfl-projects/dis-project