basic routing for create and search. working on socket items
Merge pull request #7 from Gabs00/master

Implimented DB connections with mongoose
reworking previous additions
resolved conflict
implimented signaling
initial rooms scaffolding. Test videos included
added travis cli to readme
completed webrtc implimentation, testing
Merge branch 'master' of https://github.com/HRR1-ddgz/webrtc into TEST
Merge pull request #1 from bighazycrab/master

initial rooms scaffolding. Test videos included
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into test

Conflicts:
	server/config/socketio.js
	server/routes.js
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into test

Conflicts:
	client/app/main/main.js
	client/app/rooms/rooms.controller.js
	client/index.html