Unknown
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameSenseBot/bin/Debug/GameSenseBot.application
	GameSenseBot/bin/Debug/GameSenseBot.exe
	GameSenseBot/bin/Debug/GameSenseBot.exe.manifest
	GameSenseBot/bin/Debug/GameSenseBot.pdb
	GameSenseBot/bin/Debug/GameSenseBot.vshost.application
	GameSenseBot/bin/Debug/GameSenseBot.vshost.exe.manifest
	GameSenseBot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	GameSenseBot/obj/Debug/GameSenseBot.application
	GameSenseBot/obj/Debug/GameSenseBot.csproj.FileListAbsolute.txt
	GameSenseBot/obj/Debug/GameSenseBot.csproj.GenerateResource.Cache

	GameSenseBot/obj/Debug/GameSenseBot.csprojResolveAssemblyReference.cache
	GameSenseBot/obj/Debug/GameSenseBot.exe
	GameSenseBot/obj/Debug/GameSenseBot.exe.manifest
	GameSenseBot/obj/Debug/GameSenseBot.pdb