removed node.js modules
added version file
added socket file again
Merge branch 'master' into deploy_client
updated socket.io client code
Merge branch 'master' into deploy_client

Conflicts:
	Server/serv.js
	node_modules/mysql/.npmignore
	node_modules/mysql/Changes.md
	node_modules/mysql/Readme.md
	node_modules/mysql/index.js
	node_modules/mysql/lib/Connection.js
	node_modules/mysql/lib/ConnectionConfig.js
	node_modules/mysql/lib/protocol/Auth.js
	node_modules/mysql/lib/protocol/Parser.js
	node_modules/mysql/lib/protocol/Protocol.js
	node_modules/mysql/lib/protocol/SqlString.js
	node_modules/mysql/lib/protocol/constants/charsets.js
	node_modules/mysql/lib/protocol/packets/ClientAuthenticationPacket.js
	node_modules/mysql/lib/protocol/packets/EofPacket.js
	node_modules/mysql/lib/protocol/packets/FieldPacket.js
	node_modules/mysql/lib/protocol/packets/HandshakeInitializationPacket.js
	node_modules/mysql/lib/protocol/packets/OkPacket.js
	node_modules/mysql/lib/protocol/packets/RowDataPacket.js
	node_modules/mysql/lib/protocol/sequences/Handshake.js
	node_modules/mysql/lib/protocol/sequences/Query.js
	node_modules/mysql/lib/protocol/sequences/Sequence.js
	node_modules/mysql/node_modules/require-all/package.json
	node_modules/mysql/package.json
	node_modules/mysql/test/FakeServer.js
	node_modules/mysql/test/common.js
Merge branch 'master' into deploy_client
taller graph; only one
got rid of bridge diagram placeholder
move and made permanent the reload button
put in fastclick
Merge branch 'custom_checkboxes' into deploy_client

Conflicts:
	Server/serv.js
	binnedChart.js
	index.html
module removals
Merge branch 'master' into deploy_client
Merge remote-tracking branch 'origin/couchdb' into deploy_client

Conflicts:
	index.html
	node_modules/async/LICENSE
	node_modules/async/lib/async.js
	node_modules/cradle/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml
	node_modules/cradle/node_modules/request/node_modules/qs/index.js
	node_modules/d3/.travis.yml
	node_modules/d3/LICENSE
	node_modules/d3/Makefile
	node_modules/d3/component.json
	node_modules/d3/d3.js
	node_modules/d3/d3.min.js
	node_modules/d3/index-browserify.js
	node_modules/d3/node_modules/jsdom/README.md
	node_modules/d3/node_modules/jsdom/lib/jsdom.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/browser/domtohtml.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/browser/index.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level1/core.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level2/core.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level2/html.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level2/style.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level3/core.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/level3/xpath.js
	node_modules/d3/node_modules/jsdom/lib/jsdom/selectors/index.js
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/Release/.deps/Release/contextify.node.d
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/Release/.deps/Release/obj.target/contextify/src/contextify.o.d
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/Release/contextify.node
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/Release/obj.target/contextify/src/contextify.o
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/config.gypi
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/contextify.target.mk
	node_modules/d3/node_modules/jsdom/node_modules/contextify/build/gyp-mac-tool
	node_modules/d3/node_modules/jsdom/node_modules/contextify/changelog
	node_modules/d3/node_modules/jsdom/node_modules/contextify/node_modules/bindings/package.json
	node_modules/d3/node_modules/jsdom/node_modules/contextify/package.json
	node_modules/d3/node_modules/jsdom/node_modules/contextify/src/contextify.cc
	node_modules/d3/node_modules/jsdom/node_modules/cssom/package.json
	node_modules/d3/node_modules/jsdom/node_modules/cssstyle/package.json
	node_modules/d3/node_modules/jsdom/node_modules/htmlparser/package.json
	node_modules/d3/node_modules/jsdom/node_modules/nwmatcher/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/README.md
	node_modules/d3/node_modules/jsdom/node_modules/request/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/aws-sign/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/cookie-jar/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/forever-agent/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/forever-agent/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/Readme.md
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/lib/form_data.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/node_modules/combined-stream/node_modules/delayed-stream/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/node_modules/combined-stream/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/test/integration/test-http-response.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/test/integration/test-pipe.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/test/integration/test-submit-custom.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/form-data/test/integration/test-submit.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/README.md
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/example/usage.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/lib/client.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/lib/crypto.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/lib/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/lib/server.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/lib/utils.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/LICENSE
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/lib/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/boom/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/cryptiles/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/cryptiles/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/cryptiles/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/.npmignore
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/README.md
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/lib/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/hoek/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/README.md
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/lib/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/.npmignore
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/.travis.yml
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/LICENSE
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/Makefile
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/README.md
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/lib/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test1.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test2.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/node_modules/hoek/test/modules/test3.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/node_modules/sntp/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/client.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/crypto.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/readme.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/server.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/uri.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/hawk/test/utils.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/json-stringify-safe/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/json-stringify-safe/stringify.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/json-stringify-safe/test.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/mime/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/node-uuid/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/oauth-sign/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/qs/.npmignore
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/qs/index.js
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/qs/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/node_modules/tunnel-agent/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/package.json
	node_modules/d3/node_modules/jsdom/node_modules/request/tests/test-basic-auth.js
	node_modules/d3/node_modules/jsdom/node_modules/request/tests/test-qs.js
	node_modules/d3/node_modules/jsdom/node_modules/request/tests/test-tunnel.js
	node_modules/d3/node_modules/jsdom/package.json
	node_modules/d3/package.json
	node_modules/d3/src/arrays/extent.js
	node_modules/d3/src/arrays/map.js
	node_modules/d3/src/arrays/max.js
	node_modules/d3/src/arrays/mean.js
	node_modules/d3/src/arrays/median.js
	node_modules/d3/src/arrays/min.js
	node_modules/d3/src/arrays/nest.js
	node_modules/d3/src/arrays/zip.js
	node_modules/d3/src/behavior/drag.js
	node_modules/d3/src/behavior/zoom.js
	node_modules/d3/src/color/hsl.js
	node_modules/d3/src/color/lab.js
	node_modules/d3/src/compat/style.js
	node_modules/d3/src/core/array.js
	node_modules/d3/src/dsv/csv.js
	node_modules/d3/src/dsv/dsv.js
	node_modules/d3/src/dsv/tsv.js
	node_modules/d3/src/end.js
	node_modules/d3/src/event/dispatch.js
	node_modules/d3/src/event/event.js
	node_modules/d3/src/event/mouse.js
	node_modules/d3/src/format/format.js
	node_modules/d3/src/format/formatPrefix.js
	node_modules/d3/src/geo/albers-usa.js
	node_modules/d3/src/geo/albers.js
	node_modules/d3/src/geo/area.js
	node_modules/d3/src/geo/azimuthal-equal-area.js
	node_modules/d3/src/geo/azimuthal-equidistant.js
	node_modules/d3/src/geo/bounds.js
	node_modules/d3/src/geo/centroid.js
	node_modules/d3/src/geo/circle.js
	node_modules/d3/src/geo/clip-antimeridian.js
	node_modules/d3/src/geo/clip-circle.js
	node_modules/d3/src/geo/clip.js
	node_modules/d3/src/geo/equirectangular.js
	node_modules/d3/src/geo/gnomonic.js
	node_modules/d3/src/geo/graticule.js
	node_modules/d3/src/geo/greatArc.js
	node_modules/d3/src/geo/interpolate.js
	node_modules/d3/src/geo/mercator.js
	node_modules/d3/src/geo/orthographic.js
	node_modules/d3/src/geo/path-area.js
	node_modules/d3/src/geo/path-buffer.js
	node_modules/d3/src/geo/path-centroid.js
	node_modules/d3/src/geo/path-context.js
	node_modules/d3/src/geo/path.js
	node_modules/d3/src/geo/projection.js
	node_modules/d3/src/geo/resample.js
	node_modules/d3/src/geo/rotation.js
	node_modules/d3/src/geo/spherical.js
	node_modules/d3/src/geo/stereographic.js
	node_modules/d3/src/geo/stream.js
	node_modules/d3/src/geom/delaunay.js
	node_modules/d3/src/geom/hull.js
	node_modules/d3/src/geom/polygon.js
	node_modules/d3/src/geom/quadtree.js
	node_modules/d3/src/geom/voronoi.js
	node_modules/d3/src/interpolate/ease.js
	node_modules/d3/src/layout/bundle.js
	node_modules/d3/src/layout/chord.js
	node_modules/d3/src/layout/cluster.js
	node_modules/d3/src/layout/force.js
	node_modules/d3/src/layout/hierarchy.js
	node_modules/d3/src/layout/histogram.js
	node_modules/d3/src/layout/pack.js
	node_modules/d3/src/layout/partition.js
	node_modules/d3/src/layout/pie.js
	node_modules/d3/src/layout/stack.js
	node_modules/d3/src/layout/tree.js
	node_modules/d3/src/layout/treemap.js
	node_modules/d3/src/math/random.js
	node_modules/d3/src/math/transform.js
	node_modules/d3/src/scale/category.js
	node_modules/d3/src/scale/identity.js
	node_modules/d3/src/scale/linear.js
	node_modules/d3/src/scale/log.js
	node_modules/d3/src/scale/nice.js
	node_modules/d3/src/scale/ordinal.js
	node_modules/d3/src/scale/polylinear.js
	node_modules/d3/src/scale/pow.js
	node_modules/d3/src/scale/quantile.js
	node_modules/d3/src/scale/quantize.js
	node_modules/d3/src/scale/sqrt.js
	node_modules/d3/src/scale/threshold.js
	node_modules/d3/src/selection/append.js
	node_modules/d3/src/selection/each.js
	node_modules/d3/src/selection/enter-select.js
	node_modules/d3/src/selection/enter.js
	node_modules/d3/src/selection/insert.js
	node_modules/d3/src/selection/property.js
	node_modules/d3/src/selection/remove.js
	node_modules/d3/src/selection/sort.js
	node_modules/d3/src/selection/style.js
	node_modules/d3/src/start.js
	node_modules/d3/src/svg/arc.js
	node_modules/d3/src/svg/area-radial.js
	node_modules/d3/src/svg/area.js
	node_modules/d3/src/svg/axis.js
	node_modules/d3/src/svg/brush.js
	node_modules/d3/src/svg/chord.js
	node_modules/d3/src/svg/diagonal-radial.js
	node_modules/d3/src/svg/diagonal.js
	node_modules/d3/src/svg/line-radial.js
	node_modules/d3/src/svg/line.js
	node_modules/d3/src/svg/symbol.js
	node_modules/d3/src/time/day.js
	node_modules/d3/src/time/format-iso.js
	node_modules/d3/src/time/format-utc.js
	node_modules/d3/src/time/format.js
	node_modules/d3/src/time/hour.js
	node_modules/d3/src/time/interval.js
	node_modules/d3/src/time/minute.js
	node_modules/d3/src/time/month.js
	node_modules/d3/src/time/scale-utc.js
	node_modules/d3/src/time/scale.js
	node_modules/d3/src/time/second.js
	node_modules/d3/src/time/week.js
	node_modules/d3/src/time/year.js
	node_modules/d3/src/transition/attr.js
	node_modules/d3/src/transition/delay.js
	node_modules/d3/src/transition/ease.js
	node_modules/d3/src/transition/filter.js
	node_modules/d3/src/transition/select.js
	node_modules/d3/src/transition/selectAll.js
	node_modules/d3/src/transition/style.js
	node_modules/d3/src/transition/transition.js
	node_modules/d3/src/transition/tween.js
	node_modules/d3/src/xhr/html.js
	node_modules/fastclick/README.md
	node_modules/fastclick/package.json
Merge branch 'deploy_client2' into deploy_client
Fixed a client error.
Merge branch 'master' into deploy_client
Merge branch 'master' into deploy_client
Merge branch 'master' into deploy_client