Basic file uploading
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/.bin/jade
	node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs
	node_modules/socket.io/node_modules/engine.io/node_modules/.bin/wscat
	node_modules/socket.io/node_modules/socket.io-client/node_modules/engine.io-client/node_modules/.bin/wscat
Merge branch 'Login_Support'
Merge branch 'Login_Support'
Merge branch 'Login_Support'
Basic Socket Integration
Socket Integration - now running on one port instead of two. Use 'node app'.
Cleaner Indentations
More Templating
Bootstrapping + jQuery
Pre-Modulous Searching
Sockets reworked, more efficient.
Sockets reworked, more efficient.
UI changes, Upload fixes
File 404 fix
Merge branch 'ui' of https://github.com/mattlemmone/b_sync into Socket_Interfacing

Conflicts:
	app.js
	public/javascript/sockets.js
	public/stylesheets/index.css
	views/index.jade
	views/layout.jade
Integrated chat, fixed some features, temporarily switched 'alert' back to 'chat' emissions.
Pre-room change commit.
Fixed bugs for when host leaves room - guests are inclined to wait for invite / refresh session.
Fixed bugs when guests leave.
Rooms identified by socket ID instead of username - no duplicates & safer.