Touched up team docs
Still working on sockets
Merge pull request #12 from sgenyk91/master

Still working on sockets
Implements most of socket and user auth
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