merging

src/NOCQ.Application/Program.cs

@@ -25,6 +25,7 @@ namespace NOCQ.Application
 				});
 
 			//RedisDatabase.SaveAlert(, "127.0.0.1", RedisQueues.Output, 6379, 3000);
+
 			// Parse the settings file
 			var json = System.IO.File.ReadAllText ("settings.json");
 			var settings = SettingsParser.Parse (json);

src/NOCQ/Plugins/Email/ImapInput.cs

@@ -4,11 +4,9 @@ using AE.Net.Mail;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-<<<<<<< HEAD
 using System.ComponentModel.Composition;
-=======
 using Newtonsoft.Json.Linq;
->>>>>>> de89a87aa5549aaa31cb301c1a98fff6336c7aeb
+
 
 namespace NOCQ.Plugins.Email
 {