From eda8c4ae22e8e3c2b892316257387165467e102c Mon Sep 17 00:00:00 2001
From: sametmax <lesametlemax@gmail.com>
Date: Sun, 22 Jun 2014 10:54:49 +0700
Subject: [PATCH] Bumping version, adding editor config file and a contribution
 section to the readme.

---
 .editorconfig               | 17 +++++++++++++++++
 README.rst                  | 15 ++++++++++++++-
 zerobin/default_settings.py |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..1646500
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_size = 4
+
+[*.{html,js,rb,scss,xml,less,css}]
+indent_size = 2
\ No newline at end of file
diff --git a/README.rst b/README.rst
index 5bd0208..e7dffe5 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ but in short::
 
     pip install zerobin
     zerobin
-    
+
 For now, 0bin targets Python 2.7 only. Python 3 supports is planned.
 
 How it works
@@ -103,3 +103,16 @@ What does 0bin not implement?
 .. _node.js: http://nodejs.org/
 .. _is not worth it: http://stackoverflow.com/questions/201705/how-many-random-elements-before-md5-produces-collisions
 .. _WTF licence: http://en.wikipedia.org/wiki/WTFPL
+
+Contributing
+=============
+
+Please fork the project, clone your repository and add the original repo as an upstream remote to keep yours in sync.
+
+For small fixes (typo and such), you can work on master.
+
+For features, you should create a dedicated branch.
+
+We don't require you to rebase/merge, ordinary merging is alright.
+
+Once it's ready, just request a PR.
diff --git a/zerobin/default_settings.py b/zerobin/default_settings.py
index 115132a..49cb709 100644
--- a/zerobin/default_settings.py
+++ b/zerobin/default_settings.py
@@ -6,7 +6,7 @@
 ######## NOT SETTINGS, JUST BOILER PLATE ##############
 import os
 
-VERSION = '0.3'
+VERSION = '0.4'
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 LIBS_DIR = os.path.join(os.path.dirname(ROOT_DIR), 'libs')