.

.
Merge branch 'master' of https://github.com/SilentCatVallis/AntsBattle

Conflicts:
	antsBattleAlphaVersion/01-flies/bin/Debug/flies.exe
	antsBattleAlphaVersion/01-flies/bin/Debug/flies.pdb

	antsBattleAlphaVersion/01-flies/obj/Debug/ants.csproj.FileListAbsolute.txt

	antsBattleAlphaVersion/01-flies/obj/Debug/ants.csproj.GenerateResource.Cache

	antsBattleAlphaVersion/01-flies/obj/Debug/ants.csprojResolveAssemblyReference.cache
	antsBattleAlphaVersion/01-flies/obj/Debug/flies.exe
	antsBattleAlphaVersion/01-flies/obj/Debug/flies.pdb

	antsBattleAlphaVersion/mazes.sln.ide/diagnostics/01-flies/ants.csproj.ide
	antsBattleAlphaVersion/mazes.sln.ide/graph/mazes.sln.ide
	antsBattleAlphaVersion/mazes.v11.suo
	mazes/maze.csproj.ide
	mazes/obj/Debug/maze.csproj.FileListAbsolute.txt
	mazes/obj/Debug/maze.csproj.GenerateResource.Cache