From fed04410cd6a77b0b8740cee8e872a998782c764 Mon Sep 17 00:00:00 2001
From: wimrijnders <wrijnders@gmail.com>
Date: Mon, 17 Oct 2016 15:41:23 +0200
Subject: [PATCH] ignore '.directory' (#2158)

---
 .gitignore      | 1 +
 CONTRIBUTING.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a182852b..0cfb188a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules
 .project
 .settings/
 npm-debug.log
+.directory
 
 # vim temporary files
 .*.sw[op]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6660fb3..252caf9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,6 +14,7 @@ There are a few preferences regarding **code contributions**:
 - vis.js follows the node.js code style as described
   [here](http://nodeguide.com/style.html).
 - When implementing new features, please update the documentation accordingly.
+- Make changes in the `develop` branch, not the `master` branch.
 - Send pull requests to the `develop` branch, not the `master` branch.
 - Only commit changes done in the source files under `lib`, not to the builds
   which are located in the folder `dist`.