fixed merge conflicts

main.js

@@ -17,6 +17,8 @@ var express = require('express'),
     fs = require('fs-extra'),
     mkdirp = require('mkdirp'),
     pm2 = require('pm2');
+    cluster = require('cluster');
+    numCPUs = require('os').cpus().length;
 
 Promise = require('bluebird');
 
@@ -61,6 +63,14 @@ guiapp.use('/gui', express.static(guipath));
 
 guiapp.use('/shepherd', shepherd);
 
+/*if (cluster.isMaster && process.env.NODE_ENV !== "development") {
+  for (var i = 0; i < numCPUs; i++) {
+      cluster.fork();
+  }
+}
+console.log(cluster)
+*/
+
 var rungui = guiapp.listen(appConfig.iguanaAppPort, function () {
   console.log('guiapp listening on port ' + appConfig.iguanaAppPort + '!');
 });

routes/shepherd.js

@@ -51,12 +51,15 @@ if (os.platform() === 'linux') {
 if (os.platform() === 'win32') {
 	var iguanaBin = path.join(__dirname, '../assets/bin/win64/iguana.exe');
 			iguanaBin = path.normalize(iguanaBin);
-  var iguanaDir = process.env.APPDATA + '/iguana';
+			iguanaDir = process.env.APPDATA + '/iguana';
 			iguanaDir = path.normalize(iguanaDir);
-  var iguanaConfsDir = process.env.APPDATA + '/iguana/confs';
+			iguanaConfsDir = process.env.APPDATA + '/iguana/confs';
 			iguanaConfsDir = path.normalize(iguanaConfsDir);
-  var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'),
+			iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'),
 			iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc);
+			komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'),
+			komodocliBin = path.join(__dirname, '../assets/bin/win64/komodo-cli.exe'),
+			komodoDir = process.env.APPDATA + '/Komodo';
 }
 
 shepherd.appConfig = {
@@ -685,6 +688,11 @@ function setConf(flock) {
 				ZcashDir = process.env.HOME + '/.zcash';
 	}
 
+	if (os.platform() === 'win32') {
+		var komodoDir = process.env.APPDATA + '/Komodo',
+				ZcashDir = process.env.APPDATA + '/Zcash';
+	}
+
 	switch (flock) {
 		case 'komodod':
 			var DaemonConfPath = komodoDir + '/komodo.conf';