Merge conflict changes

Dhrams · Dhrams · commit eeaa7faa157e · 2018-04-18T01:05:29.000-04:00
diff --git a/Drone/inventorylist.org b/Drone/inventorylist.org
@@ -173,6 +173,4 @@ Effectively, make it thin and increase strength on thin frames by two planks. Go
  Size: 15mm*25mm (approx)
  #+END_TEXT
 
-
-
-
+* Link to simulink code
