From d5c5c666a9da2488cc7266724c7f545bfd5fc679 Mon Sep 17 00:00:00 2001
From: Max Zwiessele <ibinbei@gmail.com>
Date: Thu, 16 May 2013 13:39:36 +0100
Subject: [PATCH] added .orig and noseid files to be ignored

---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index 60866848..6c03ec1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,11 @@ nosetests.xml
 
 #bfgs optimiser leaves this lying around
 iterate.dat
+
+# Nosetests #
+#############
+*.noseids
+
+# git merge files #
+###################
+*.orig
\ No newline at end of file