diff --git a/public/assignments/week07.html b/public/assignments/week07.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc3b8a904d239638f98730178ff01f0402319ae4
--- /dev/null
+++ b/public/assignments/week07.html
@@ -0,0 +1,215 @@
+<!DOCTYPE html>
+<html lang="en-us">
+ <head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="generator" content="GitLab Pages">
+ <meta name="description" content="Fab Academy documentation site for Charlotte Fab-C">
+ <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+ <link rel="stylesheet" href="../assets/css/main.css" />
+ <title>Charlotte Fab-C - Fab Academy</title>
+
+ </head>
+ <body class="is-preload">
+ <!-- Wrapper -->
+ <div id="wrapper">
+
+ <!-- Main -->
+ <div id="main">
+ <div class="inner">
+
+ <!-- Header -->
+ <header id="header">
+ <a href="../index.html" class="logo"><strong>Charlotte - FabLab de Charleroi</strong> Fab Academy website</a>
+ <ul class="icons">
+ <li><a href="https://www.facebook.com/littlebelge" class="icon brands fa-facebook-f" target="_blank"><span class="label">Facebook</span></a></li>
+ <li><a href="https://www.instagram.com/little.belge/" class="icon brands fa-instagram" target="_blank"><span class="label">Instagram</span></a></li>
+ <li><a href="https://gitlab.fabcloud.org/charlotte-vandenbulcke" class="icon brands fa-gitlab" target="_blank"><span class="label">Gitlab</span></a></li>
+ </ul>
+ </header>
+
+ <!-- Section -->
+ <section id="banner">
+ <div class="content">
+
+ <header class="main">
+ <h2>7. Computer Controlled Machining</h2>
+ </header>
+
+ <section>
+ <p></p>
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Group assignment</h3>
+ <p></p>
+
+ <h4>Safety training</h4>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ <h5>...</h5>
+
+ <p>
+ <ul>
+ <li></li>
+ </ul>
+ </p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ <h5>...</h5>
+
+ <p></p>
+
+ <h4>Tests</h4>
+
+ <h5>Object design in Freecad</h5>
+
+ <p></p>
+
+ <h5>Object cut with CNC</h5>
+
+ <p></p>
+
+ <h6>Parameters</h6>
+
+ <p></p>
+
+ <p>Link to our <a href="https://fabacademy.org/2024/labs/fabc/group-assignment/week007/" target="_blank">Group page</a></p>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Individual assignment</h3>
+
+ <h4>CNC Project</h4>
+
+ <p></p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ <h5>Design</h5>
+
+ <p></p>
+
+ <h5>Mill</h5>
+
+ <p></p>
+
+ <h5>Assemble</h5>
+
+ <p></p>
+
+ <span class="object">
+ <video width="600" height="300" controls>
+ <source src="../images/...mp4" type="video/mp4">
+ </video>
+ </span>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>My journey</h3>
+
+ <p></p>
+
+ <span class="image object">
+ <img src="../images/...jpg" alt="..." />
+ </span>
+
+ </section>
+
+ <hr>
+
+ <section>
+ <h3>Files and resources</h3>
+
+ <p><strong>My files</strong></p>
+ <ul>
+ <li><a href="../files/..." target="_blank">...</a></li>
+ </ul>
+
+ <p><strong>Resources</strong></p>
+ <ul>
+ <li><a href="..." target="_blank">...</a></li>
+ <li><a href="https://fabacademy.org/2024/labs/fabc/" target="_blank">Our group page</a></li>
+ </ul>
+ </section>
+ </div>
+ </section>
+
+ </div>
+ </div>
+
+ <!-- Sidebar -->
+ <div id="sidebar">
+ <div class="inner">
+
+ <!-- Menu -->
+ <nav id="menu">
+ <header class="major">
+ <h2>Menu</h2>
+ </header>
+ <ul>
+ <li><a href="../index.html">Homepage</a></li>
+ <li><a href="../assignments.html">Assignments</a></li>
+ <li>
+ <span class="opener">Week per week</span>
+ <ul>
+ <li><a href="../assignments/week01.html">1. Project Management</a></li>
+ <li><a href="../assignments/week02.html">2. Computer Aided Design</a></li>
+ <li><a href="../assignments/week03.html">3. Computer Controlled Cutting</a></li>
+ <li><a href="../assignments/week04.html">4. Electronics Production</a></li>
+ <li><a href="../assignments/week05.html">5. 3D Scanning And Printing</a></li>
+ <li><a href="../assignments/week06.html">6. Embedded Programming</a></li>
+ <li><a href="../assignments/week07.html">7. Computer Controlled Machining</a></li>
+ <li><a href="../assignments/week08.html">8. Electronics Design</a></li>
+ <li><a href="../assignments/week09.html">9. Molding And Casting</a></li>
+ <li><a href="../assignments/week10.html">10. Output Devices</a></li>
+ <li><a href="../assignments/week11.html">11. Mechanical Design And Machine Design</a></li>
+ <li><a href="../assignments/week12.html">12. Input Devices</a></li>
+ <li><a href="../assignments/week13.html">13. Networking And Communications</a></li>
+ <li><a href="../assignments/week14.html">14. Interface And Application Programming</a></li>
+ <li><a href="../assignments/week15.html">15. Wildcard Week</a></li>
+ <li><a href="../assignments/week16.html">16. Applications And Implications</a></li>
+ <li><a href="../assignments/week17.html">17. Invention, Intellectual Property And Income</a></li>
+ <li><a href="../assignments/week18.html">18. Project Development</a></li>
+ </ul>
+ </li>
+ <li><a href="../final-project.html">Final Project</a></li>
+
+ <li><a href="../about.html">About Me</a></li>
+ </nav>
+
+ <!-- Footer -->
+ <footer id="footer">
+ <p class="copyright">© Charlotte - FabLab de Charleroi. Fab Academy 2024. All rights reserved. Design: <a href="https://html5up.net">HTML5 UP</a>.</p>
+ </footer>
+
+ </div>
+ </div>
+
+ </div>
+
+ <!-- Scripts -->
+ <script src="../assets/js/jquery.min.js"></script>
+ <script src="../assets/js/browser.min.js"></script>
+ <script src="../assets/js/breakpoints.min.js"></script>
+ <script src="../assets/js/util.js"></script>
+ <script src="../assets/js/main.js"></script>
+
+ </body>
+</html>
diff --git a/public/final-project.html b/public/final-project.html
index 11629b8732f72c42b85409e172f826969d9a22a8..f759111954517a8bb7fb43db3493cbbb107e7a30 100644
--- a/public/final-project.html
+++ b/public/final-project.html
@@ -114,9 +114,9 @@
<li><a href="assignments/week03.html">3. Computer Controlled Cutting</a></li>
<li><a href="assignments/week04.html">4. Electronics Production</a></li>
<li><a href="assignments/week05.html">5. 3D Scanning And Printing</a></li>
- <li><a href="assignments/week06.html">6. Electronics Design</a></li>
+ <li><a href="assignments/week06.html">6. Embedded Programming</a></li>
<li><a href="assignments/week07.html">7. Computer Controlled Machining</a></li>
- <li><a href="assignments/week08.html">8. Embedded Programming</a></li>
+ <li><a href="assignments/week08.html">8. Electronics Design</a></li>
<li><a href="assignments/week09.html">9. Molding And Casting</a></li>
<li><a href="assignments/week10.html">10. Output Devices</a></li>
<li><a href="assignments/week11.html">11. Mechanical Design And Machine Design</a></li>
diff --git a/public/images/CNCcalculatorLachiver.jpg b/public/images/CNCcalculatorLachiver.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3e9a1ad184d1fcd0c2cf394d5d9a1e7a5286b2ff
Binary files /dev/null and b/public/images/CNCcalculatorLachiver.jpg differ
diff --git a/public/images/CNCcalculatroSDenis.jpg b/public/images/CNCcalculatroSDenis.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e351f7a7372528403282e14696c9e0564162f57e
Binary files /dev/null and b/public/images/CNCcalculatroSDenis.jpg differ
diff --git a/public/images/ajouteroutilexistant.jpg b/public/images/ajouteroutilexistant.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e53c4614c008801e207bf866fda1df279830d14f
Binary files /dev/null and b/public/images/ajouteroutilexistant.jpg differ
diff --git a/public/images/ajoutmetier2possibilites.jpg b/public/images/ajoutmetier2possibilites.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d6fe0cc175d11c2651a5261ac023ff9cb47ab539
Binary files /dev/null and b/public/images/ajoutmetier2possibilites.jpg differ
diff --git a/public/images/ajoutparampoche.jpg b/public/images/ajoutparampoche.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3c26ad9436f395cc14895d1e77a23a54bbafad9b
Binary files /dev/null and b/public/images/ajoutparampoche.jpg differ
diff --git a/public/images/alias-ok.jpg b/public/images/alias-ok.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bd913b50863bc102142f42d02736afc95019e31f
Binary files /dev/null and b/public/images/alias-ok.jpg differ
diff --git a/public/images/alias-spreadsheet-v.jpg b/public/images/alias-spreadsheet-v.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c90b7c3a073e2208bfc6fc6d0dd2d582e3fcfd88
Binary files /dev/null and b/public/images/alias-spreadsheet-v.jpg differ
diff --git a/public/images/alias-spreadsheet.jpg b/public/images/alias-spreadsheet.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ef225d4972b3193af467a789ce838db1e9960e8a
Binary files /dev/null and b/public/images/alias-spreadsheet.jpg differ
diff --git a/public/images/aseok.jpg b/public/images/aseok.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..50400c94f6b24830c733df19f96a82bcee83f1c0
Binary files /dev/null and b/public/images/aseok.jpg differ
diff --git a/public/images/attentionmodif.jpg b/public/images/attentionmodif.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4c5ee04fb75c6ee657f24b95b2672b7f757ddcc0
Binary files /dev/null and b/public/images/attentionmodif.jpg differ
diff --git a/public/images/bbonnepositionX.jpg b/public/images/bbonnepositionX.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d92f703b987ccf91008c8f78406d5cde7d309ca0
Binary files /dev/null and b/public/images/bbonnepositionX.jpg differ
diff --git a/public/images/bonnecriture.jpg b/public/images/bonnecriture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..29e3ee2fe554e5c1e356fc95d7cef3e62344e237
Binary files /dev/null and b/public/images/bonnecriture.jpg differ
diff --git a/public/images/bonnemesurecote.jpg b/public/images/bonnemesurecote.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..93e35c17fe5faf659dfebcf069861c51a078c01f
Binary files /dev/null and b/public/images/bonnemesurecote.jpg differ
diff --git a/public/images/bonnepositionY.jpg b/public/images/bonnepositionY.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fd50e77c752158c80b1917af20a1a06f53ce6e8f
Binary files /dev/null and b/public/images/bonnepositionY.jpg differ
diff --git a/public/images/bonresultata.jpg b/public/images/bonresultata.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..881adf35971c7c6c7a8de9a3098b32a43e3322aa
Binary files /dev/null and b/public/images/bonresultata.jpg differ
diff --git a/public/images/calcul.jpg b/public/images/calcul.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ef511fc0a06b7a3dd36b8f90f96c0a8bfe012dc3
Binary files /dev/null and b/public/images/calcul.jpg differ
diff --git a/public/images/calcul2.jpg b/public/images/calcul2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..84f77c846c1080880a77dffab57ad64d72f632d9
Binary files /dev/null and b/public/images/calcul2.jpg differ
diff --git a/public/images/cerclediamok.jpg b/public/images/cerclediamok.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e57193119b27034bd4bb7f09971fb54884d38b2b
Binary files /dev/null and b/public/images/cerclediamok.jpg differ
diff --git a/public/images/cercleenfinOK.jpg b/public/images/cercleenfinOK.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0a43380faf47e1c051a40cba4d454a2536091687
Binary files /dev/null and b/public/images/cercleenfinOK.jpg differ
diff --git a/public/images/changer param nouvel outil.jpg b/public/images/changer param nouvel outil.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a91c47a46f434de480433f5affb15dd5c1de9246
Binary files /dev/null and b/public/images/changer param nouvel outil.jpg differ