Je moeder
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameManagement/bin/x86/Debug/GameManagement.dll
	GameManagement/bin/x86/Debug/GameManagement.pdb
	GameManagement/obj/x86/Debug/GameManagement.dll
	GameManagement/obj/x86/Debug/GameManagement.pdb
	TickTick/FinishingGame.v12.suo
	TickTick/TickTick5/bin/x86/Debug/GameManagement.dll
	TickTick/TickTick5/bin/x86/Debug/GameManagement.pdb
	TickTick/TickTick5/bin/x86/Debug/TickTick.exe
	TickTick/TickTick5/bin/x86/Debug/TickTick.pdb
	TickTick/TickTick5/obj/x86/Debug/TickTick.exe
	TickTick/TickTick5/obj/x86/Debug/TickTick.pdb

	TickTick/TickTick5/obj/x86/Debug/TickTick5.csprojResolveAssemblyReference.cache