Update readme

Author: mhord

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 MiniGen
 =======
 
@@ -28,3 +29,35 @@ The code is beerware; if you see me (or any other SparkFun employee) at the
 local, and you've found our code helpful, please buy us a round!
 
 Distributed as-is; no warranty is given.
+=======
+MiniGen
+=======
+
+[![MiniGen](https://cdn.sparkfun.com//assets/parts/7/2/2/3/11420-01.jpg)*MiniGen Signal Generator
+(BOB-11420)*](https://www.sparkfun.com/products/11420)
+
+The [MiniGen](https://www.sparkfun.com/products/11420) designed to be used
+either as a stand-alone board or as a shield that can be placed on top of an
+Arduino Pro Mini. It's capable of generating sine, square or triangle waves at
+up to 3MHz, and approximately 1Vp-p. The output is at a DC offset of Vcc/2.
+Neither the offset nor the amplitude can be varied.
+
+The MiniGen can be powered by any voltage from 2.3V to 5.5V, so it can be used
+with either a 3.3V or 5V Pro Mini without any voltage regulation or signal level
+shifting needed.
+
+Repository Contents
+-------------------
+* **/Arduino** - Arduino library and example
+* **/Hardware** - EAGLE Design files
+* **/Production** - Test bed files and production panels
+
+License Information
+-------------------
+The hardware is released under [Creative Commons ShareAlike 4.0
+International](https://creativecommons.org/licenses/by-sa/4.0/).
+The code is beerware; if you see me (or any other SparkFun employee) at the
+local, and you've found our code helpful, please buy us a round!
+
+Distributed as-is; no warranty is given.
+>>>>>>> 3730e83ace0b83af408834ea5b4ee673f0e1c248