diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c091839
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,50 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+
+# Numerous always-ignore extensions
+###################
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+
+*.sass-cache
+# Folders to ignore
+###################
+.hg
+.svn
+.CVS
+# OS or Editor folders
+###################
+.DS_Store
+Icon?
+Thumbs.db
+ehthumbs.db
+nbproject
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+*.sublime-project
+*.sublime-workspace
+# Dreamweaver added files
+###################
+_notes
+dwsync.xml
+# Komodo
+###################
+*.komodoproject
+.komodotools
diff --git a/pycucumber/tests/helper/features/more_examples.feature b/pycucumber/tests/helper/features/more_examples.feature
index 43a6fb1..ed7b55f 100644
--- a/pycucumber/tests/helper/features/more_examples.feature
+++ b/pycucumber/tests/helper/features/more_examples.feature
@@ -2,7 +2,7 @@ Feature:
   Scenario:
     When var:pass
     Then var:pass
-    
+
     More Examples:
       | input1 | input2 |
       | fail   | fail   |
\ No newline at end of file
diff --git a/pycucumber/tests/self.feature b/pycucumber/tests/self.feature
index 781ba6b..f93b2cd 100644
--- a/pycucumber/tests/self.feature
+++ b/pycucumber/tests/self.feature
@@ -12,7 +12,7 @@ Feature:
       And 0 tests should be unimplemented
       And 0 tests should be skipped
       And 0 tests should be ambiguous
-    
+
     More Examples:
       | feature | rule | test_succeed | pass | pass | fail | fail | uimp | uimp | skip | skip | ambig | ambig |
       | helper/features/fail_first_given.feature | helper/rules/simple.py | fail | 0 | pass | 1 | fail | 0 | be unimplemented | 7 | be skipped | 0 | be ambiguous |
diff --git a/pycucumber/tests/test_desc b/pycucumber/tests/test_desc
index 74afaf7..6dff863 100644
--- a/pycucumber/tests/test_desc
+++ b/pycucumber/tests/test_desc
@@ -2,7 +2,7 @@ Feature: Addition
   In order to avoid silly mistakes
   As a math idiot
   I want to be told the sum of two numbers
- 
+
   Scenario: Add two numbers
     Given I have entered 50 into the calculator
     And I have entered 70 into the calculator