Merge branch 'master' of gitlab.fabcloud.org:preacademy/preacademy2018

166e8dc4 · abuomar1211980 · cb670db4 · 7020666a · 166e8dc4 · 166e8dc4
Commit 166e8dc4 authored 7 years ago by abuomar1211980
--- a/participants/elshare.anas/di.jpg
+++ b/participants/elshare.anas/di.jpg
--- a/participants/elshare.anas/index.html
+++ b/participants/elshare.anas/index.html
@@ -18,9 +18,15 @@
 </li>
 <li><a href="3D_printer.html">3D Printer and Scanner.</a><br />
 </li>
-<li><a href="electronix_production.html">Electronics Production.</a><br />
-<img src="./Jaguar-emblem.png" /> #Final Project<br />
-<a href="final_project.html">Final Project Documentation</a></li>
+<li><a href="electronix_production.html">ElectronicsProduction.</a></li>
 </ol>
+<div class="figure">
+<img src="./di.jpg" />
+
+</div>
+<h1 id="final-project">Final Project</h1>
+<p><a href="final_project.html">Final Project Documentation</a></p>
+<h1 id="about-me">About Me</h1>
+<p>Enthusiastic Civil Engineer holding a Masters Degree in Structural Engineering from <strong>JUST</strong> and now Working as Instructor at <strong>AlHussein Techincal University.</strong> I am an AI lover and I have made some researches in the field of Artificial Neural Networks.</p>
 </body>
 </html>
--- a/participants/elshare.anas/index.md
+++ b/participants/elshare.anas/index.md
-#Assignments  
+
+# Assignments  
 1. [Introduction to Fab-Lab](About_Fab.html)  
 2. [Working With Linux](About_Fab.html)  
 3. [Vinyl Cutter.](vinyl.html)  
 4. [3D Printer and Scanner.](3D_printer.html)  
-5. [Electronics Production.](electronix_production.html)  
-![](./Jaguar-emblem.png)
-#Final Project  
+5. [ElectronicsProduction.](electronix_production.html)  
+
+![](./di.jpg)
+
+# Final Project  
   [Final Project Documentation](final_project.html)
+
+# About Me
+Enthusiastic Civil Engineer holding a Masters Degree in Structural Engineering from **JUST** and now Working as Instructor at **AlHussein Techincal University.** I am an AI lover and I have made some researches in the field of Artificial Neural Networks.
--- a/participants/elshare.anas/test.txt
+++ b/participants/elshare.anas/test.txt
+hello
--- a/participants/fares.ahmad/images/jy1.jpg
+++ b/participants/fares.ahmad/images/jy1.jpg
--- a/participants/fares.ahmad/index.html
+++ b/participants/fares.ahmad/index.html
@@ -9,12 +9,27 @@
 </head>
 <body>
 <h1 id="index-page">Index Page</h1>
+<p>My name is Ahmad Fares, I have graduated from Jordan University of Science and Technology as a <em>mechanical engineer</em>. I am a member of <strong>Masar initiative</strong> which aims to build and launch Jordan's First satellite and now I am taking the prefab academy to build the crown prince foundation fab lab.</p>
+<p>This a photo which shows our satellite. <img src="images/jy1.jpg" /></p>
+<p>My first linux command is <code>sudo apt update</code></p>
+<p>list of machines in the fab lab:</p>
 <ul>
-<li><a href="introduction.html">Introduction</a></li>
+<li>laser cutter</li>
+<li>3d printers</li>
+<li>ultimaker</li>
+<li>formlabs</li>
+<li>shopbot</li>
+<li>vinyl cutter</li>
+<li>PCB mill</li>
+<li>CNC machine</li>
 </ul>
-<h1 id="final-project">Final Project</h1>
-<ul>
+<h3 id="documentation">Documentation</h3>
+<ol style="list-style-type: decimal">
+<li><a href="introduction.html">Introduction</a></li>
+<li><a href="vinyl.html">vinyl cutter</a></li>
+<li><a href="Linux.html">Linux</a></li>
+<li><a href="laserCutter.html">lader cutter</a></li>
 <li><a href="finalProject.html">Final Project</a></li>
-</ul>
+</ol>
 </body>
 </html>
--- a/participants/fares.ahmad/index.md
+++ b/participants/fares.ahmad/index.md
 # Index Page

- [Introduction](introduction.html)
+My name is Ahmad Fares, I have graduated from Jordan University of Science and Technology as a *mechanical engineer*. I am a member of **Masar initiative** which aims to build and launch Jordan's First satellite and now I am taking the prefab academy to build the crown prince foundation fab lab.

-# Final Project

- [Final Project](finalProject.html)
+This a photo which shows our satellite.
+![](images/jy1.jpg)
+
+My first linux command is `sudo apt update`
+
+list of machines in the fab lab:
+
+- laser cutter
+- 3d printers
+ - ultimaker
+ - formlabs
+- shopbot
+- vinyl cutter
+- PCB mill
+- CNC machine
+
+### Documentation 
+
+1. [Introduction](introduction.html)
+1. [vinyl cutter](vinyl.html)
+1. [Linux](Linux.html)
+1. [lader cutter](laserCutter.html)
+1. [Final Project](finalProject.html)
--- a/participants/qwider.walaa/htu.png
+++ b/participants/qwider.walaa/htu.png
--- a/participants/qwider.walaa/htu2.jpg
+++ b/participants/qwider.walaa/htu2.jpg
--- a/participants/qwider.walaa/htu2.png
+++ b/participants/qwider.walaa/htu2.png
--- a/participants/qwider.walaa/image/kar1
+++ b/participants/qwider.walaa/image/kar1
--- a/participants/qwider.walaa/image/kar2.JPG
+++ b/participants/qwider.walaa/image/kar2.JPG
--- a/participants/qwider.walaa/image/kar3.jpg
+++ b/participants/qwider.walaa/image/kar3.jpg
--- a/participants/qwider.walaa/image/strip.png
+++ b/participants/qwider.walaa/image/strip.png
--- a/participants/qwider.walaa/index.html
+++ b/participants/qwider.walaa/index.html
@@ -19,7 +19,13 @@
 <li><a href="laser.html">Laser Cutting</a></li>
 <li><a href="shopbot.html">Shopbot</a></li>
 </ul>
+<div class="figure">
+<img src="htu.png" />
+
+</div>
 <h1 id="final-project">Final project</h1>
 <p><a href="finalpro.html">Final Project</a></p>
+<h1 id="who-am-i">Who am I ?</h1>
+<p>I'm <strong>Eng.Walaa Qwider</strong>. A computer and communication Engineer. I'm working at **HTU University*. Now we are taking a <strong>Prefab training</strong> to be prepared well to <strong>Fab_Academy</strong> course.</p>
 </body>
 </html>
--- a/participants/qwider.walaa/index.md
+++ b/participants/qwider.walaa/index.md
-#Index Page  
+# Index Page  
 - [Introduction to Linux](introduction.html)  
 - [Vinyl Cutter](vinyl.html)  
 - [3D Printing and Scanning ](3dprinting_scanning.html)
 - [Electronics Production](electronics_prod.html)
 - [Laser Cutting](laser.html)
- [Shopbot](shopbot.html)
+- [Shopbot](shopbot.html)  

+![](htu.png)

-#Final project
+# Final project
 [Final Project](finalpro.html)
+
+# Who am I ?
+I'm **Eng.Walaa Qwider**. A computer and communication Engineer. I'm working at **HTU University*. Now we are taking a **Prefab training** to be prepared well to **Fab_Academy** course. 
--- a/test.txt
+++ b/test.txt
+go