From 069d8ae1695c05e35526eb9b78ae2bae8643883c Mon Sep 17 00:00:00 2001
From: Mohamed Elkebir <elkebir.med@gmail.com>
Date: Wed, 9 Oct 2013 12:17:35 +0100
Subject: [PATCH 1/2] Remove FlipCSS from package.json

Former-commit-id: ce4788b07a382f251baa31e0ac8047f7dc009d61
Former-commit-id: 8739bbbdfb709ef26d55f44afbc624fb7488c776
---
 node/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/node/package.json b/node/package.json
index 9be3ec287..79a7c7015 100755
--- a/node/package.json
+++ b/node/package.json
@@ -23,7 +23,6 @@
     "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-docco-multi": "0.0.2",
-    "grunt-flipcss": "~0.1.2",
     "grunt-cssjanus": "~0.1.1"
   }
 }

From 92701c544f869603d99efe9a7edea6eb9903ebcc Mon Sep 17 00:00:00 2001
From: Mohamed Elkebir <elkebir.med@gmail.com>
Date: Wed, 9 Oct 2013 12:22:00 +0100
Subject: [PATCH 2/2] Ignoring some files types

Former-commit-id: d5ea9ad66e4a003309b73fd9a6c8e40460274e9e
Former-commit-id: 207e8763c2e592048d2a96d92c752d3033bbdadb
---
 .gitignore | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 310b78cc6..497e3c970 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,30 @@
 docs/
 node/server.json
-node/node_modules
\ No newline at end of file
+node/node_modules
+
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.zip
+*.vi
+*~
+*.sass-cache
+*.ruby-version
+
+# OS or Editor folders
+.DS_Store
+._*
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
\ No newline at end of file