nema promena samo test
Merge branch 'master' of https://github.com/ibozinova/VP

Conflicts:
	Game/Game.suo
	Game/Game/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
niso
Merge branch 'master' of https://github.com/ibozinova/VP

Conflicts:
	Game/Game.suo
	Game/Game/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/ibozinova/VP

Conflicts:
	Game/Game.suo
	Game/Game/bin/Debug/Game.exe
	Game/Game/obj/x86/Debug/Game.exe
	Game/Game/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
Merge branch 'master' of https://github.com/ibozinova/VP

Conflicts:
	Game/Game.suo
	Game/Game/Form1.cs
	Game/Game/bin/Debug/Game.exe
	Game/Game/bin/Debug/Game.pdb
	Game/Game/bin/Release/Game.exe
	Game/Game/bin/Release/Game.pdb
	Game/Game/obj/x86/Debug/Game.exe
	Game/Game/obj/x86/Debug/Game.pdb
	Game/Game/obj/x86/Debug/GenerateResource.read.1.tlog
	Game/Game/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
	Game/Game/obj/x86/Release/Game.exe
	Game/Game/obj/x86/Release/Game.pdb
	Game/Game/obj/x86/Release/GenerateResource.read.1.tlog
	Game/Game/obj/x86/Release/GenerateResource.write.1.tlog
	Game/Game/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
Merge branch 'master' of https://github.com/ibozinova/VP

Conflicts:
	Game/Game.suo
	Game/Game/Form1.cs
	Game/Game/bin/Debug/Game.exe
	Game/Game/bin/Debug/Game.pdb
	Game/Game/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Game/Game/obj/x86/Debug/Game.exe
	Game/Game/obj/x86/Debug/GenerateResource.read.1.tlog
proba