Merge branch 'KevinBranch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Merge branch 'Brendan's-Branch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Merge branch 'Brendan's-Branch' of https://github.com/Ludusamo/Team-KD.git into Richard'sBranch
Merge branch 'harrisonbranch' of https://github.com/Ludusamo/Team-KD.git into Richard'sBranch
Signed-off-by: Richard Chen <richard.0.chen@gmail.com>
Is deck and playedpile scripts on yet?
Signed-off-by: Harrding <harrisond2003@gmail.com>
Merge branch 'Richard'sBranch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Merge branch 'KevinBranch' of https://github.com/Ludusamo/Team-KD into harrisonbranch
Merge branch 'Brendan's-Branch' of https://github.com/Ludusamo/Team-KD into harrisonbranch

Conflicts:
	Multiplayer/Multiplayer_Data/output_log.txt
	Multiplayer/ProjectSettings/EditorBuildSettings.asset
	Multiplayer/ProjectSettings/QualitySettings.asset
	Multiplayer/ProjectSettings/TagManager.asset

Not sure about some of these conflicts. Contain conflicts on output log.txt in Multiplayer_Data folder

Signed-off-by: Harrding <harrisond2003@gmail.com>
Signed-off-by: Harrding <harrisond2003@gmail.com>
Merge remote-tracking branch 'origin/harrisonbranch' into Austin's-Branch

Conflicts:
	Multiplayer/Assets/Resources/PlayerObject.prefab
	Multiplayer/Assets/Resources/RoomGUI.prefab
	Multiplayer/Assets/Scenes/MainMenu.unity
	Multiplayer/Multiplayer_Data/Managed/Assembly-CSharp.dll
	Multiplayer/Multiplayer_Data/PlayerConnectionConfigFile
	Multiplayer/Multiplayer_Data/mainData
	Multiplayer/Multiplayer_Data/output_log.txt
	Multiplayer/Multiplayer_Data/resources.assets
	Multiplayer/Multiplayer_Data/sharedassets0.assets
	Multiplayer/ProjectSettings/AudioManager.asset
	Multiplayer/ProjectSettings/DynamicsManager.asset
	Multiplayer/ProjectSettings/EditorSettings.asset
	Multiplayer/ProjectSettings/GraphicsSettings.asset
	Multiplayer/ProjectSettings/InputManager.asset
	Multiplayer/ProjectSettings/NavMeshLayers.asset
	Multiplayer/ProjectSettings/NetworkManager.asset
	Multiplayer/ProjectSettings/Physics2DSettings.asset
	Multiplayer/ProjectSettings/ProjectSettings.asset
	Multiplayer/ProjectSettings/QualitySettings.asset
	Multiplayer/ProjectSettings/TimeManager.asset