diff --git a/.gitignore b/.gitignore
index a490d17..d40693b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #Dreamweaver .TMP files
 *.TMP
 *.tmp
@@ -24,8 +23,7 @@ dw_php_codehinting.config
 
 # OS Files
 .DS_Store
-.DS_Store?
-=======
-wp-content/uploads
 
->>>>>>> 734f97bb1f6b82815b03f904a4b519112724d44c
+#npm stuffs
+node_modules/
+.sass_cache
\ No newline at end of file
diff --git a/gruntfile.js b/gruntfile.js
new file mode 100644
index 0000000..e69de29
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c957e04
--- /dev/null
+++ b/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "content-warning-v2",
+  "version": "1.0.0",
+  "description": "Wordpress Plugin",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/JayWood/content-warning-v3.git"
+  },
+  "author": "Jay Wood",
+  "license": "GPLv2",
+  "bugs": {
+    "url": "https://github.com/JayWood/content-warning-v3/issues"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-sass": "~0.7.3",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-contrib-cssmin": "~0.10.0",
+    "grunt-contrib-uglify": "~0.5.0"
+  }
+}