merged inisitl github repo

KyleGW · KyleGW · commit acf27fd54dcc · 2014-11-25T23:12:26.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,19 @@
+<<<<<<< HEAD
 # Created by https://www.gitignore.io
 
 ### VisualStudio ###
+=======
+>>>>>>> 586f771b2af63ad989c14883c5005be49ab6f60a
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
 *.suo
 *.user
+<<<<<<< HEAD
 *.userosscache
+=======
+>>>>>>> 586f771b2af63ad989c14883c5005be49ab6f60a
 *.sln.docstates
 
 # Build results
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+TestRepo1
+=========
