added error object for webrtc and video requests
Merge pull request #44 from dnc223/master

chat
changed positioning of injected scripts
Merge pull request #45 from bighazycrab/master

changed positioning of injected scripts
Merge pull request #46 from dnc223/master

Chat fixes
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into no-video

Conflicts:
	client/app/rooms/rooms.controller.js
	client/components/socket/webrtc.service.js
updated name
Merge pull request #47 from dscx/master

updated name
added more directions. whitespace edits
fixed meeting name
Merge pull request #48 from dscx/master

Changed name and layout.
changed name to main
Merge pull request #49 from dscx/master

changed name on main page
added error handling to webrtc service for unsupported or denied permission requests
Merge branch 'master' of github.com:HRR1-ddgz/webrtc into no-video
changed connection host and port
changed controller style
rolled back changes
commented rooms controller
merged seperate socket.ios into one with different namespaces for chats and rooms. Set chat controller as a controller on the main angular app. removed ng-app directive from rooms.html chat-container div