From bc47a951d985e00ca394c4d960ca670c694d4451 Mon Sep 17 00:00:00 2001
From: cedro63 <cedricpim@gmail.com>
Date: Tue, 6 Nov 2012 08:07:21 -0800
Subject: [PATCH] Initial commit

---
 .gitignore | 16 ++++++++++++++++
 README.md  |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..54cb8bb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.rspec
+/.bundle
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6abb42a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+merchant
+========
\ No newline at end of file