Refactored
Adds some dependencies
adding node_modules
adding other node_modules
Merge pull request #10 from caro5/master

added node_modules
Merge pull request #11 from sgenyk91/master

Fixes socket problem
Fix merge conflict
Touched up team docs
Merge pull request #12 from sgenyk91/master

Still working on sockets
Merge pull request #13 from sgenyk91/master

Implements most of socket and user auth
Pull setup
Merge branch 'master' of https://github.com/OPAL-DEVICE/unstable-asteroid

Conflicts:
	server/rooms/roomController.js
	server/server.js
	server/users/userController.js

Complete merge
Implement user login/signup
Merge pull request #14 from jimgong92/master

User signup/login now sends back lobby
Adds server-side file attachment, message retrieval now specific to room
Delete npm-debug.log
Message retrieval now specific to room
Merge branch 'master' of https://github.com/jimgong92/unstable-asteroid
Fixed syntax error
Merge branch 'master' of https://github.com/OPAL-DEVICE/unstable-asteroid