GitLab

Merge Delphine

See merge request !9

Merge branch 'DelphineBranch' of https://gitlab.insa-rouen.fr/dbannier/projet_fr into DelphineBranch

Merge branch 'DelphineBranch' of https://gitlab.insa-rouen.fr/dbannier/projet_fr into DelphineBranch

fix functions

See merge request !8

# Conflicts:
#   preprocessing/scale_data.py
#   processing/models.py

MergeMaster/delphine

See merge request !7

Merge branch 'DelphineBranch' of https://gitlab.insa-rouen.fr/dbannier/projet_fr into DelphineBranch