A
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer

Conflicts:
	SnitchApplicationServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer
w
Update .gitignore
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer

Conflicts:
	SnitchApplicationServer/bin/SnitchApplicationServer.dll
	SnitchApplicationServer/bin/SnitchApplicationServer.pdb
	SnitchApplicationServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.dll
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.pdb
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer

Conflicts:
	SnitchApplicationServer/bin/SnitchApplicationServer.dll
	SnitchApplicationServer/bin/SnitchApplicationServer.pdb
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.csproj.FileListAbsolute.txt
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.dll
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.pdb
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer
ASD
Merge branch 'master' of https://github.com/khoraappserver/ApplicatonServer

Conflicts:
	SnitchApplicationServer/bin/SnitchApplicationServer.dll
	SnitchApplicationServer/bin/SnitchApplicationServer.pdb
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.dll
	SnitchApplicationServer/obj/Debug/SnitchApplicationServer.pdb