diff --git a/designRules-2015-03.dru b/designRules-2015-03.dru
new file mode 100644
index 0000000..465ad28
--- /dev/null
+++ b/designRules-2015-03.dru
@@ -0,0 +1,69 @@
+description[de] = EAGLE Design Rules \n
\nDie Standard-Design-Rules sind so gewählt, dass sie für \ndie meisten Anwendungen passen. Sollte ihre Platine \nbesondere Anforderungen haben, treffen Sie die erforderlichen\nEinstellungen hier und speichern die Design Rules unter \neinem neuen Namen ab.
+description[en] = EAGLE Design Rules \n
\nThe default Design Rules have been set to cover\na wide range of applications. Your particular design\nmay have different requirements, so please make the\nnecessary adjustments and save your customized\ndesign rules under a new name.
+layerSetup = (1*16)
+mtCopper = 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm 0.035mm
+mtIsolate = 1.5mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm 0.15mm 0.2mm
+mdWireWire = 18mil
+mdWirePad = 18mil
+mdWireVia = 20mil
+mdPadPad = 14mil
+mdPadVia = 14mil
+mdViaVia = 14mil
+mdSmdPad = 10mil
+mdSmdVia = 10mil
+mdSmdSmd = 10mil
+mdViaViaSameLayer = 8mil
+mnLayersViaInSmd = 2
+mdCopperDimension = 30mil
+mdDrill = 30mil
+mdSmdStop = 0mil
+msWidth = 15mil
+msDrill = 24mil
+msMicroVia = 24mil
+msBlindViaRatio = 0.500000
+rvPadTop = 0.250000
+rvPadInner = 0.250000
+rvPadBottom = 0.250000
+rvViaOuter = 0.250000
+rvViaInner = 0.250000
+rvMicroViaOuter = 0.250000
+rvMicroViaInner = 0.250000
+rlMinPadTop = 10mil
+rlMaxPadTop = 20mil
+rlMinPadInner = 10mil
+rlMaxPadInner = 20mil
+rlMinPadBottom = 10mil
+rlMaxPadBottom = 20mil
+rlMinViaOuter = 8mil
+rlMaxViaOuter = 20mil
+rlMinViaInner = 8mil
+rlMaxViaInner = 20mil
+rlMinMicroViaOuter = 4mil
+rlMaxMicroViaOuter = 20mil
+rlMinMicroViaInner = 4mil
+rlMaxMicroViaInner = 20mil
+psTop = -1
+psBottom = -1
+psFirst = -1
+psElongationLong = 100
+psElongationOffset = 100
+mvStopFrame = 1.000000
+mvCreamFrame = 0.000000
+mlMinStopFrame = 4mil
+mlMaxStopFrame = 4mil
+mlMinCreamFrame = 0mil
+mlMaxCreamFrame = 0mil
+mlViaStopLimit = 0mil
+srRoundness = 0.000000
+srMinRoundness = 0mil
+srMaxRoundness = 0mil
+slThermalIsolate = 10mil
+slThermalsForVias = 1
+dpMaxLengthDifference = 10mm
+dpGapFactor = 2.500000
+checkGrid = 0
+checkAngle = 0
+checkFont = 1
+checkRestrict = 1
+useDiameter = 13
+maxErrors = 50
diff --git a/esc.brd b/esc.brd
index abf167f..cff7c43 100644
--- a/esc.brd
+++ b/esc.brd
@@ -29,11 +29,19 @@
+<<<<<<< HEAD
+=======
+
+
+
+
+
+>>>>>>> master
@@ -48,7 +56,7 @@
-
+
@@ -59,7 +67,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
@@ -77,9 +89,69 @@
+<<<<<<< HEAD
Akeman
Belenon
ESC 3.1
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Akeman & Belenon ESC 0.1
+Akeman & Belenon ESC 0.1
+
+
+
+>>>>>>> master
@@ -1804,6 +1876,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -1813,14 +1886,31 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+>>>>>>> master
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> master
@@ -2122,17 +2212,52 @@ design rules under a new name.
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -2250,6 +2375,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -2279,6 +2405,58 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -2344,6 +2522,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -2405,6 +2584,40 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -2441,6 +2654,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -2498,6 +2712,67 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -2562,8 +2837,15 @@ design rules under a new name.
+<<<<<<< HEAD
+=======
+
+
+
+
+>>>>>>> master
@@ -2835,6 +3117,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -2869,6 +3152,29 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -2884,6 +3190,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -2913,6 +3220,8 @@ design rules under a new name.
+=======
+>>>>>>> master
@@ -2972,6 +3281,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -3018,6 +3328,51 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
@@ -3080,6 +3435,7 @@ design rules under a new name.
+<<<<<<< HEAD
@@ -3088,25 +3444,84 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
+<<<<<<< HEAD
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
+<<<<<<< HEAD
@@ -3148,6 +3563,55 @@ design rules under a new name.
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> master
diff --git a/esc.sch b/esc.sch
index d0dd1e4..7f164f2 100644
--- a/esc.sch
+++ b/esc.sch
@@ -19197,7 +19197,7 @@ W = angled<p>
-
+
@@ -19981,29 +19981,6 @@ W = angled<p>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -20237,6 +20214,30 @@ W = angled<p>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+