# HG changeset patch
# User ethanzonca@CL-SEC241-08.cedarville.edu
# Date 2012-10-31 19:58:30
# Node ID 1a123aeeb393f346af0b2f369ff85a36c66a9f5c
# Parent 41a1f30a7fc277df5b947d18bc0aff46db77bc34
# Parent 9090f2fd96231fb4e4383b0a4d19024572877ba8
merge
diff --git a/slave/slave.brd b/slave/slave.brd
--- a/slave/slave.brd
+++ b/slave/slave.brd
@@ -32,7 +32,7 @@
-
+
@@ -1021,15 +1021,11 @@ Please make sure your boards conform to
-
-
-
-
-
+
@@ -1037,7 +1033,7 @@ Please make sure your boards conform to
-
+
@@ -1058,26 +1054,19 @@ Please make sure your boards conform to
-
-
-
-
-
-
-
-
+
-
+
@@ -1104,38 +1093,46 @@ Please make sure your boards conform to
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1242,11 +1239,9 @@ Please make sure your boards conform to
-
-
-
-
-
+
+
+
@@ -1254,6 +1249,8 @@ Please make sure your boards conform to
+
+
@@ -1363,7 +1360,20 @@ Please make sure your boards conform to
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1378,7 +1388,19 @@ Please make sure your boards conform to
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1403,9 +1425,9 @@ Please make sure your boards conform to
-
-
-
+
+
+
@@ -1468,8 +1490,7 @@ Please make sure your boards conform to
-
-
+
@@ -1478,6 +1499,7 @@ Please make sure your boards conform to
+
@@ -1488,7 +1510,7 @@ Please make sure your boards conform to
-
+
@@ -1550,20 +1572,22 @@ Please make sure your boards conform to
-
-
+
+
+
+
+
-
-
-
+
+
@@ -1581,52 +1605,102 @@ Please make sure your boards conform to
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1634,56 +1708,70 @@ Please make sure your boards conform to
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1716,14 +1804,14 @@ Please make sure your boards conform to
-
-
+
+
+
-
-
+