ss q3 a 2
Merge branch 'master' of https://github.com/Cellule/inf4420a