Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	SolidWorks 2-22-14/Bottom panel components/solidwork
part/~$Bottom_Panel_ASSY-1.SLDPRT
	SolidWorks 2-22-14/SidePanels/~$solar panel assembly 2.SLDPRT
	SolidWorks 2-22-14/Spacers 2-22-14/~$Finished 1.5 cm.SLDPRT
	SolidWorks 2-22-14/Spacers 2-22-14/~$Finished 1.55 cm.SLDPRT
	SolidWorks 2-22-14/Spacers 2-22-14/~$Finished 1.7 cm.SLDPRT
	SolidWorks 2-22-14/Spacers 2-22-14/~$Finished 2.35 cm.SLDPRT
	SolidWorks 2-22-14/Thumbs.db
	SolidWorks 2-22-14/Top Panel components/~$Dipole.SLDPRT
	SolidWorks 2-22-14/Top Panel
components/~$Dipole_Antenna_Mount_Bottom.SLDPRT
	SolidWorks 2-22-14/Top Panel
components/~$Dipole_Antenna_Mount_Top.SLDPRT
	SolidWorks 2-22-14/Top Panel
components/~$Mono_Antenna_Mount_Bottom.SLDPRT
	SolidWorks 2-22-14/Top Panel components/~$Mono_Antenna_Mount_Top.SLDPRT
	SolidWorks 2-22-14/Top Panel components/~$Monopole.SLDPRT
	SolidWorks 2-22-14/Top Panel components/~$Top_Panel_board.SLDPRT
	SolidWorks 2-22-14/~$Assem1.SLDASM
	SolidWorks 2-22-14/~$Aux_board.SLDPRT
	SolidWorks 2-22-14/~$CSK_1U_Chassis_Skeleton_RevD.SLDPRT
	SolidWorks 2-22-14/~$He-100.SLDPRT
	SolidWorks 2-22-14/~$Solar clips.SLDPRT
	SolidWorks 2-22-14/~$battery.SLDPRT
	SolidWorks 2-22-14/~$diagnosticpannlea-1.SLDPRT
	SolidWorks 2-22-14/~$motherboard2.SLDPRT