Fixed merges

README.md

@@ -4,7 +4,7 @@
 [![devDependency Status](https://david-dm.org/thingsSDK/flasher.js/dev-status.svg)](https://david-dm.org/thingsSDK/flasher.js#info=devDependencies)
 
 
-<img src="http://thingssdk.com/flasher.js.svg" width="180px" height="180px">
+<img src="http://thingssdk.com/images/flasher.js.svg" width="180px" height="180px">
 
 
 _Flasher.js_ is a tool to get JavaScript running natively on

package.json

@@ -14,7 +14,7 @@
     "pack-windows-32": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=win32 --arch=ia32 --icon=resources/icon.ico --prune=true --out=out --version-string.CompanyName=ThingsSDK --version-string.FileDescription=Flasher.js --version-string.ProductName=Flasher.js",
     "pack-mac": "electron-packager . Flasher.js --asar --asar-unpack=protocol-link.html --overwrite --platform=darwin --arch=x64 --icon=resources/icon.icns --prune=true --out=out --osx-sign.identity='Developer ID Application: Secret Monkey Science'",
     "pack-linux": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=linux --arch=x64 --icon=resources/png/icon64.png --prune=true --out=out",
-  
+
     "sign-mac": "electron-osx-sign out/Flasher.js-darwin-x64/Flasher.js.app",
     "sign-windows": "node ./scripts/sign-windows.js",
     "sign-windows-32": "node ./scripts/sign-windows-32.js",