From: Sarah Westcott <mothur.westcott@gmail.com>
Date: Fri, 3 Feb 2012 14:16:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'mothur/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=50b8969afdc29f038b0fb73a528e51220cb87f19;hp=c1b16d543da6750cf9308c51f0ecab39fccefbbc;p=mothur.git

Merge remote-tracking branch 'mothur/master'
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store