fixed conflicts

Author: davinerd

Chaosfile.json

@@ -5,6 +5,12 @@
   ],
   "disableForASGs": [
   ],
+  "enableForTags": [
+  	{
+  		"key": "chaos_monkey",
+  		"value": "true"
+	}
+  ],
   "slackWebhook": [
   	{
   		"channel": "#random",

lambda/index.js

@@ -51,6 +51,14 @@ ec2.describeInstances(function(err, data) {
               }
             }
           }
+        } else {
+          if (llamaConfig.enableForTags) {
+            llamaConfig.enableForTags.forEach(function(asgTags) {
+              if (asgTags.key == tag.Key && asgTags.value == tag.Value) {
+                candidates.push(inst);
+              }
+            });
+          }
         }
       });
     });