.
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc

Conflicts:
	app/assets/javascripts/controllers.coffee
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
Merge branch 'master' of https://github.com/coreyauger/play-webrtc
merge