implimented signaling
completed webrtc implimentation, testing
socketio fix from repo recovery
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into test

Conflicts:
	server/config/socketio.js
	server/routes.js
Merge pull request #2 from dscx/master

socketio fix from repo recovery
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
Change CSS, design, background image of homepage
changed /rooms to /rooms/
resolved conflicts
Merge branch 'master' of https://github.com/dnc223/webrtc into dchung

Conflicts:
	server/config/socketio.js
Merge pull request #3 from dnc223/master

Change CSS, design, background image of homepage
Reimplimented webrtc class. Added additional event handlers for signaling on server
skeleton test file. starting fresh
Merge branch 'master' of https://github.com/HRR1-ddgz/webrtc
Initial dist subtree commit
added comment
initial heroku
Merge pull request #5 from dscx/master

Heroku update and travis fix.
Change WebRTC factory to provide streams instead of html elements. Added toggle and mute abilities
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into client-webertc
Merge pull request #6 from Gabs00/master

Added WebRTC on client side