Merge branch 'master' into 'master'

# Conflicts:
#   Liste_etudiants.csv

Liste_etudiants.csv

@@ -86,7 +86,7 @@ dana.davar@student.uclouvain.be,"Davar, Dânâ",Oui
 loic.davreux@student.uclouvain.be,"Davreux, Loïc",Oui
 nicolas.debacker@student.uclouvain.be,"De Backer, Nicolas",Non
 anouk.debelle@student.uclouvain.be,"Debelle, Anouk",Non
-arnaud.deckers@student.uclouvain.be,"Deckers, Arnaud",Non
+arnaud.deckers@student.uclouvain.be,"Deckers, Arnaud",Oui
 maxence.deckers@student.uclouvain.be,"Deckers, Maxence",Non
 thomas.degouys@student.uclouvain.be,"Degouys, Thomas",Oui
 vincent.degrooff@student.uclouvain.be,"Degrooff, Vincent",Oui
@@ -238,8 +238,13 @@ abdel.nchare@student.uclouvain.be,"Nchare Fokouo, Abdel Hakim",Non
 lucas.nelis@student.uclouvain.be,"Nélis, Lucas",Oui
 eline.nenin@student.uclouvain.be,"Nenin, Eline",Oui
 raphael.ngenyi@student.uclouvain.be,"Ngenyi-Ngondo, Raphaël",Non
-chloe.noiset@student.uclouvain.be,"Noiset, Chloé",Non
+<<<<<<< Liste_etudiants.csv
+chloe.noiset@student.uclouvain.be,"Noiset, Chloé",Oui
 heloise.nolf@student.uclouvain.be,"Nolf, Héloïse",Oui
+=======
+chloe.noiset@student.uclouvain.be,"Noiset, Chloé",Oui
+heloise.nolf@student.uclouvain.be,"Nolf, Héloïse",Non
+>>>>>>> Liste_etudiants.csv
 andru.onciul@student.uclouvain.be,"Onciul, Andru",Oui
 sophie.otlet@student.uclouvain.be,"Otlet, Sophie",Oui
 martin.paredes@student.uclouvain.be,"Paredes Celis, Martin",Non