Merge pull request #898 from theshadowx/master

Team TheMatrix PR

Teams/TheMatrix/ABOUT.md

@@ -0,0 +1,8 @@
+
+# TheMatrix
+
+I'm Ali, software/hardware engineer.
+
+# Skills
+
+Programming languages : C/C++,Qt, VHDL, HTML/CSS, MatLab

Teams/TheMatrix/team.jason

@@ -0,0 +1,12 @@
+{
+  "teamName": "TheMatrix",
+  "members": [
+    {
+      "name": "Ali Diouri",
+      "twitter": "AliDiouriX",
+      "koding": "theshadowx",
+      "location": "Rabat, MA",
+      "lead": true
+    }
+  ]
+}