Merge remote-tracking branch 'refs/remotes/origin/work-in-progress'

.gitignore

@@ -61,4 +61,8 @@ Software/Firmware_Board1/Firmware_Board1/Debug/*.*
 Media Campaign/Video/*.*
 Software/Firmware_Board1/Firmware_Board1/Debug/Makefile
 Media Campaign/kickstarter special requests.txt
-Production Planning/costed parts list.xlsx
+Production Planning/costed parts list.xlsx
+Electrical/Board Design/clock.bak
+Electrical/Board Design/clock.bak
+Marketing/*
+"Production Planning/*"

Electrical/Board Design/clock-cache.bck

@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0  Date: 11/1/2015 1:45:08 PM
+#
+#End Doc Library

Electrical/Board Design/clock-cache.dcm

@@ -0,0 +1,3 @@
+EESchema-DOCLIB  Version 2.0  Date: 11/1/2015 1:49:12 PM
+#
+#End Doc Library

Electrical/Board Design/clock-cache.lib

@@ -1,6 +1,20 @@
-EESchema-LIBRARY Version 2.3  Date: 10/29/2015 9:48:35 PM
+EESchema-LIBRARY Version 2.3  Date: 11/11/2015 10:32:11 PM
 #encoding utf-8
 #
+# +5V
+#
+DEF +5V #PWR 0 40 Y Y 1 F P
+F0 "#PWR" 0 90 20 H I C CNN
+F1 "+5V" 0 90 30 H V C CNN
+F2 "~" 0 0 60 H V C CNN
+F3 "~" 0 0 60 H V C CNN
+DRAW
+X +5V 1 0 0 0 U 20 20 0 0 W N
+C 0 50 20 0 1 0 N
+P 4 0 1 0  0 0  0 30  0 30  0 30 N
+ENDDRAW
+ENDDEF
+#
 # AMMETER
 #
 DEF AMMETER DS 0 40 Y Y 1 F N
@@ -291,6 +305,24 @@ X V_IN 6 -550 100 300 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# MCP1702T-1502E/CB
+#
+DEF MCP1702T-1502E/CB U 0 40 Y Y 1 F N
+F0 "U" -200 200 40 H V C CNN
+F1 "MCP1702T-1502E/CB" 0 200 40 H V L CNN
+F2 "TO-92" 0 100 30 H V C CIN
+F3 "~" 0 0 60 H V C CNN
+$FPLIST
+ TO*
+$ENDFPLIST
+DRAW
+S -250 150 250 -150 0 1 10 f
+X GND 1 0 -250 100 U 40 40 1 1 W
+X OUT 2 400 50 150 L 40 40 1 1 w
+X IN 3 -400 50 150 R 40 40 1 1 I
+ENDDRAW
+ENDDEF
+#
 # MCP1702T-1502E/TO
 #
 DEF MCP1702T-1502E/TO U 0 40 Y Y 1 F N