Fixing .gitignore conflict

.gitattributes

+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

+#################
+## SparkFun Useful stuff
+#################
+
+## AVR Development
+*.eep
+*.elf
+*.lst
+*.lss
+*.sym
+*.d
+*.o
+*.srec
+*.map
+
+## Notepad++ backup files
+*.bak
+
+## BOM files
+*bom*
+
 #################
 ## Eclipse
 #################
@@ -33,15 +54,9 @@ local.properties
 ## Eagle
 #############
 
-# Ignore the board and schematic backup files (and the csv BOMs)
+# Ignore the board and schematic backup files
 *.b#?
 *.s#?
-*.csv#
-*.csv
-*.G??
-*.ZIP
-*.TXT
-*.dri
 
 
 #################

README.md

-Pro_Micro
+Pro Micro
 =========
+
+[![Pro Micro 5V](https://cdn.sparkfun.com//assets/parts/9/3/2/6/12640-01a.jpg)
+*Pro Micro 5V (DEV-12640)*](https://www.sparkfun.com/products/12640)
+
+
+The Pro Micro is a micro controller with an ATMega32U4 IC on board.
+The USB transceiver is inside the 32U4, adding USB connectivity on-board without external USB interfaces. 
+This comes in both a 3.3V and 5V version. 
+
+
+Repository Contents
+-------------------
+* **/Hardware** - All Eagle design files (.brd, .sch, .STL)
+* **/Production** - Test bed files and production panel files
+
+
+Product Versions
+----------------
+* [DEV-12587](https://www.sparkfun.com/products/12587)- 3.3V/8MHz version
+* [DEV-12640](https://www.sparkfun.com/products/12640)- 5V/16MHz version
+
+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.