From 935597c3fac4ee00bab450e1d1135574fdfa3db7 Mon Sep 17 00:00:00 2001
From: Aaron Lord <aaron@lorddesign.net>
Date: Sun, 2 Apr 2017 20:14:38 -0700
Subject: [PATCH] ignore

---
 .gitignore | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 37c3813..6d8d2d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,8 +28,6 @@ local.properties
 # PDT-specific
 .buildpath
 
-node_modules/
-
 #################
 ## Visual Studio
 #################
@@ -116,7 +114,6 @@ Backup*/
 UpgradeLog*.XML
 
 
-
 ############
 ## Windows
 ############
@@ -163,5 +160,14 @@ pip-log.txt
 # Mac crap
 .DS_Store
 
+#################
+# Custom
+#################
+
+.vs/*
+
+# Created by mergetool
+*.orig
+
 # Ignore node thingy
-node_modules
\ No newline at end of file
+node_modules/
\ No newline at end of file