albenoit · Vapie · Sep 15, 2020 · Sep 15, 2020 · Sep 15, 2020 · Sep 15, 2020
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/Nouveau dossier.iml b/.idea/Nouveau dossier.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ install:
   - pip install -r requirements.txt
 addons:
   sonarcloud:
-    organization: albenoit-github
+    organization: vapie-github
 # command to run tests
 script:
   - pytest -v --cov .

diff --git a/README.md b/README.md
@@ -1,8 +1,13 @@
+<<<<<<< HEAD
+# BachelorDIM-Lectures-Algorithms-2020
+[![Coverage Status](https://coveralls.io/repos/github/Vapie/BachelorDIM-Lectures-Algorithms-2020/badge.svg?branch=master)](https://coveralls.io/github/Vapie/BachelorDIM-Lectures-Algorithms-2020?branch=master)
+=======
 [![Coverage Status](https://coveralls.io/repos/github/albenoit/BachelorDIM-Lectures-Algorithms-2020/badge.svg?branch=master)](https://coveralls.io/github/albenoit/BachelorDIM-Lectures-Algorithms-2020?branch=master)
 
 # BachelorDIM-Lectures-Algorithms-2020
+>>>>>>> 66e4209149807cf20f70f79343f71b0882472d0f
 Algorithms, code writing and continuous integration @ DIM Bachelor, Université Savoie Mont Blanc, France
-
+testyo
 
 Those lessons are addressed to the "Développeur Informatique Multisupports" (DIM) Bachelor proposed at Université Savoie Mont Blanc in France.
 Students are expected to be familiar with programming. The aim is to get more familiar with code quality, maintainability and efficacy... and Python.

diff --git a/__pycache__/myCodeSamples.cpython-37.pyc b/__pycache__/myCodeSamples.cpython-37.pyc
diff --git a/__pycache__/test_demo.cpython-37-PYTEST.pyc b/__pycache__/test_demo.cpython-37-PYTEST.pyc
diff --git a/assignements/.idea/.gitignore b/assignements/.idea/.gitignore
diff --git a/assignements/.idea/assignements.iml b/assignements/.idea/assignements.iml
diff --git a/assignements/.idea/inspectionProfiles/Project_Default.xml b/assignements/.idea/inspectionProfiles/Project_Default.xml
diff --git a/assignements/.idea/inspectionProfiles/profiles_settings.xml b/assignements/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/assignements/.idea/misc.xml b/assignements/.idea/misc.xml
diff --git a/assignements/.idea/modules.xml b/assignements/.idea/modules.xml
diff --git a/assignements/.idea/vcs.xml b/assignements/.idea/vcs.xml