Gitignore node_modules
Merge branch 'master' of github.com:pixel-to-noise/in.c

Conflicts:
	node_modules/firmata/examples/blink.js
	node_modules/firmata/examples/k22.js
	node_modules/firmata/examples/servosweep.js
	node_modules/firmata/lib/firmata.js
	node_modules/firmata/node_modules/serialport/AUTHORS
	node_modules/firmata/node_modules/serialport/README.md
	node_modules/firmata/node_modules/serialport/binding.gyp
	node_modules/firmata/node_modules/serialport/build/Makefile
	node_modules/firmata/node_modules/serialport/build/Release/.deps/Release/obj.target/serialport/src/serialport.o.d
	node_modules/firmata/node_modules/serialport/build/Release/.deps/Release/obj.target/serialport/src/serialport_unix.o.d
	node_modules/firmata/node_modules/serialport/build/Release/obj.target/serialport/src/serialport.o
	node_modules/firmata/node_modules/serialport/build/Release/obj.target/serialport/src/serialport_unix.o
	node_modules/firmata/node_modules/serialport/build/Release/serialport.node
	node_modules/firmata/node_modules/serialport/build/config.gypi
	node_modules/firmata/node_modules/serialport/build/serialport.target.mk
	node_modules/firmata/node_modules/serialport/changelog.md
	node_modules/firmata/node_modules/serialport/node_modules/async/package.json
	node_modules/firmata/node_modules/serialport/node_modules/bindings/README.md
	node_modules/firmata/node_modules/serialport/node_modules/bindings/bindings.js
	node_modules/firmata/node_modules/serialport/node_modules/bindings/package.json
	node_modules/firmata/node_modules/serialport/node_modules/optimist/.travis.yml
	node_modules/firmata/node_modules/serialport/node_modules/optimist/index.js
	node_modules/firmata/node_modules/serialport/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/firmata/node_modules/serialport/node_modules/optimist/package.json
	node_modules/firmata/node_modules/serialport/node_modules/optimist/test/parse.js
	node_modules/firmata/node_modules/serialport/node_modules/sf/.travis.yml
	node_modules/firmata/node_modules/serialport/node_modules/sf/README.md
	node_modules/firmata/node_modules/serialport/node_modules/sf/lib/stringFormat.js
	node_modules/firmata/node_modules/serialport/node_modules/sf/package.json
	node_modules/firmata/node_modules/serialport/node_modules/sf/test/stringFormatTest.js
	node_modules/firmata/node_modules/serialport/package.json
	node_modules/firmata/node_modules/serialport/serialport.js
	node_modules/firmata/node_modules/serialport/src/serialport.cpp
	node_modules/firmata/node_modules/serialport/src/serialport.h
	node_modules/firmata/node_modules/serialport/src/serialport_unix.cpp
	node_modules/firmata/node_modules/serialport/src/serialport_win.cpp
	node_modules/firmata/node_modules/serialport/src/win/disphelper.c
	node_modules/firmata/package.json
	node_modules/firmata/test/MockSerialPort.js
	node_modules/firmata/test/firmata.js