Design
Merge branch 'master' of https://github.com/MasterSpl1nter/GYM

Conflicts:
	newGym/newGym/addManager.Designer.cs
	newGym/newGym/bin/Debug/he-IL/newGym.resources.dll
	newGym/newGym/bin/Debug/newGym.exe
	newGym/newGym/bin/Debug/newGym.pdb
	newGym/newGym/obj/x86/Debug/he-IL/newGym.resources.dll
	newGym/newGym/obj/x86/Debug/newGym.csproj.GenerateResource.Cache
	newGym/newGym/obj/x86/Debug/newGym.exe
	newGym/newGym/obj/x86/Debug/newGym.pdb