Merge branch 'master' of github.com:sourcey/libsourcey

Conflicts:
	cmake/FindWebRTC.cmake
	src/webrtc/include/scy/webrtc/audiopacketmodule.h
	src/webrtc/include/scy/webrtc/multiplexmediacapturer.h
	src/webrtc/include/scy/webrtc/peer.h
	src/webrtc/include/scy/webrtc/peermanager.h
	src/webrtc/include/scy/webrtc/streamrecorder.h
	src/webrtc/include/scy/webrtc/util.h
	src/webrtc/include/scy/webrtc/videopacketsource.h
	src/webrtc/src/audiopacketmodule.cpp
	src/webrtc/src/multiplexmediacapturer.cpp
	src/webrtc/src/streamrecorder.cpp

Author: auscaster

.gitattributes

@@ -0,0 +1,16 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cmake text
+*.cpp text
+*.h text
+*.md text
+*.txt text
+*.json text
+*.sh text
+
+# Denote all files that are truly binary and should not be modified.
+*.mp4 binary
+