Adds personal stuff

ptrr · Jul 16, 2012 · 7ca4f7a · 7ca4f7a
2 parents 17076a2 + 75b32fc
commit 7ca4f7a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 .bundle
 .DS_Store
 .sass-cache
@@ -13,3 +14,23 @@ source/javascripts/octopress.min.js
 source/images/icon-*.png
 vendor
 node_modules
+=======
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
+>>>>>>> 75b32fc89eba9418ec0423fe1fd709c2a764dd1d
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+space-nd-random
+===============