Create README.md
Update README.md
Revert ec026a1..e5e609f

This rolls back to commit ec026a13a3ebecd7a0a5fd7570532f775f3bc23c.
Merge pull request #1 from elaval/makers

Merge Mac release from Ernesto
trying out Ernesto's MacOSX version
removed makers branch modificiations
removed makers branch README
latest Snap merged
fixes #7
MacOSX version working!
Uploaded a faulty version in which the connect block wasn't working. Oops! Fixed now.
hack that fixes #5
fixed #6
Merge remote-tracking branch 'upstream/master'

Updates upstream Snap4Arduino
Merge branch 'master' into makers

Conflicts:
	modules/gnu/node_modules/node-twitter-api/LICENSE
	modules/win32/node_modules/request/README.md
	modules/win32/node_modules/request/lib/cookies.js
	modules/win32/node_modules/request/node_modules/aws-sign2/package.json

modules/win32/node_modules/request/node_modules/forever-agent/package.js
on
	modules/win32/node_modules/request/node_modules/form-data/Readme.md

modules/win32/node_modules/request/node_modules/form-data/lib/form_data.
js

modules/win32/node_modules/request/node_modules/form-data/node_modules/a
sync/.travis.yml

modules/win32/node_modules/request/node_modules/form-data/node_modules/a
sync/LICENSE

modules/win32/node_modules/request/node_modules/form-data/node_modules/a
sync/README.md

modules/win32/node_modules/request/node_modules/form-data/node_modules/a
sync/lib/async.js

modules/win32/node_modules/request/node_modules/form-data/node_modules/a
sync/package.json

modules/win32/node_modules/request/node_modules/form-data/node_modules/c
ombined-stream/Readme.md

modules/win32/node_modules/request/node_modules/form-data/node_modules/c
ombined-stream/lib/combined_stream.js

modules/win32/node_modules/request/node_modules/form-data/node_modules/c
ombined-stream/node_modules/delayed-stream/package.json

modules/win32/node_modules/request/node_modules/form-data/node_modules/c
ombined-stream/package.json

modules/win32/node_modules/request/node_modules/form-data/node_modules/m
ime/package.json
	modules/win32/node_modules/request/node_modules/form-data/package.json
	modules/win32/node_modules/request/node_modules/hawk/README.md
	modules/win32/node_modules/request/node_modules/hawk/lib/browser.js
	modules/win32/node_modules/request/node_modules/hawk/lib/client.js
	modules/win32/node_modules/request/node_modules/hawk/lib/crypto.js
	modules/win32/node_modules/request/node_modules/hawk/lib/index.js
	modules/win32/node_modules/request/node_modules/hawk/lib/server.js

modules/win32/node_modules/request/node_modules/hawk/node_modules/boom/p
ackage.json

modules/win32/node_modules/request/node_modules/hawk/node_modules/crypti
les/package.json

modules/win32/node_modules/request/node_modules/hawk/node_modules/hoek/p
ackage.json

modules/win32/node_modules/request/node_modules/hawk/node_modules/sntp/p
ackage.json
	modules/win32/node_modules/request/node_modules/hawk/package.json
	modules/win32/node_modules/request/node_modules/hawk/test/browser.js

modules/win32/node_modules/request/node_modules/http-signature/node_modu
les/asn1/package.json

modules/win32/node_modules/request/node_modules/http-signature/node_modu
les/assert-plus/package.json

modules/win32/node_modules/request/node_modules/http-signature/node_modu
les/ctype/package.json

modules/win32/node_modules/request/node_modules/http-signature/package.j
son

modules/win32/node_modules/request/node_modules/json-stringify-safe/pack
age.json
	modules/win32/node_modules/request/node_modules/mime-types/.npmignore
	modules/win32/node_modules/request/node_modules/mime-types/.travis.yml
	modules/win32/node_modules/request/node_modules/mime-types/LICENSE
	modules/win32/node_modules/request/node_modules/mime-types/Makefile
	modules/win32/node_modules/request/node_modules/mime-types/README.md
	modules/win32/node_modules/request/node_modules/mime-types/SOURCES.md

modules/win32/node_modules/request/node_modules/mime-types/component.jso
n

modules/win32/node_modules/request/node_modules/mime-types/lib/custom.js
on
	modules/win32/node_modules/request/node_modules/mime-types/lib/index.js

modules/win32/node_modules/request/node_modules/mime-types/lib/mime.json

modules/win32/node_modules/request/node_modules/mime-types/lib/node.json
	modules/win32/node_modules/request/node_modules/mime-types/package.json
	modules/win32/node_modules/request/node_modules/node-uuid/package.json
	modules/win32/node_modules/request/node_modules/oauth-sign/package.json
	modules/win32/node_modules/request/node_modules/qs/package.json

modules/win32/node_modules/request/node_modules/tough-cookie/node_module
s/punycode/README.md

modules/win32/node_modules/request/node_modules/tough-cookie/node_module
s/punycode/package.json

modules/win32/node_modules/request/node_modules/tough-cookie/node_module
s/punycode/punycode.js

modules/win32/node_modules/request/node_modules/tough-cookie/package.jso
n

modules/win32/node_modules/request/node_modules/tunnel-agent/package.jso
n
	modules/win32/node_modules/request/package.json
	modules/win32/node_modules/request/request.js
	release/gnu/Snap4Arduino.tar.gz
	release/gnu/Snap4Arduino/app.nw
	release/osx/Snap4Arduino.app/Contents/Resources/app.nw
	release/osx/Snap4Arduino.app/Contents/Resources/app.nw2.nw/package.json
	release/osx/Snap4Arduino.app/Contents/Resources/app.nw2.nw/s4a.html

release/osx/Snap4Arduino.app/Contents/Resources/app.nw2.nw/s4aObjects.js

release/osx/Snap4Arduino.app/Contents/Resources/app.nw2.nw/s4aThreads.js
	release/osx/Snap4Arduino.zip
	release/win32/app.nw
	snap/history.txt
	snap/lists.js
	snap/makers.js
	snap/makersObjects.js
	snap/makersThreads.js
	snap/node_modules/.bin/node-pre-gyp
	snap/node_modules/browser-serialport/.jshintrc
	snap/node_modules/browser-serialport/.npmignore
	snap/node_modules/browser-serialport/README.md
	snap/node_modules/browser-serialport/index.js
	snap/node_modules/browser-serialport/package.json
	snap/node_modules/serialport/.travis.yml
	snap/node_modules/serialport/README.md
	snap/node_modules/serialport/build/Makefile

snap/node_modules/serialport/build/Release/.deps/Release/obj.target/seri
alport/src/serialport.o.d

snap/node_modules/serialport/build/Release/.deps/Release/obj.target/seri
alport/src/serialport_poller.o.d

snap/node_modules/serialport/build/Release/.deps/Release/obj.target/seri
alport/src/serialport_unix.o.d

snap/node_modules/serialport/build/Release/.deps/Release/serialport.node
.d

snap/node_modules/serialport/build/Release/obj.target/serialport/src/ser
ialport.o

snap/node_modules/serialport/build/Release/obj.target/serialport/src/ser
ialport_poller.o

snap/node_modules/serialport/build/Release/obj.target/serialport/src/ser
ialport_unix.o
	snap/node_modules/serialport/build/Release/serialport.node
	snap/node_modules/serialport/build/action_after_build.target.mk
	snap/node_modules/serialport/build/config.gypi
	snap/node_modules/serialport/build/serialport.target.mk
	snap/node_modules/serialport/node_modules/async/package.json
	snap/node_modules/serialport/node_modules/bindings/package.json
	snap/node_modules/serialport/node_modules/nan/package.json
	snap/node_modules/serialport/node_modules/node-pre-gyp/CHANGELOG.md
	snap/node_modules/serialport/node_modules/node-pre-gyp/README.md
	snap/node_modules/serialport/node_modules/node-pre-gyp/lib/info.js
	snap/node_modules/serialport/node_modules/node-pre-gyp/lib/install.js
	snap/node_modules/serialport/node_modules/node-pre-gyp/lib/publish.js

snap/node_modules/serialport/node_modules/node-pre-gyp/lib/testbinary.js
	snap/node_modules/serialport/node_modules/node-pre-gyp/lib/unpublish.js

snap/node_modules/serialport/node_modules/node-pre-gyp/lib/util/abi_cros
swalk.json

snap/node_modules/serialport/node_modules/node-pre-gyp/lib/util/nw_cross
walk.json
	snap/node_modules/serialport/node_modules/node-pre-gyp/package.json

snap/node_modules/serialport/node_modules/optimist/node_modules/wordwrap
/package.json
	snap/node_modules/serialport/node_modules/optimist/package.json
	snap/node_modules/serialport/node_modules/sf/package.json
	snap/node_modules/serialport/package.json
	snap/node_modules/serialport/parsers.js
	snap/node_modules/serialport/serialport.js
	snap/node_modules/serialport/src/build/config.gypi
	snap/s4a.html
	snap/threads.js
Finalise merge