Testmerge
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.Tests.dll
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.Tests.pdb
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.dll
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.pdb
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.csprojResolveAssemblyReference.cache
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.dll
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.pdb
	Game-Zone/Game-Zone.v11.suo
	Game-Zone/Game-Zone/bin/Game-Zone.dll
	Game-Zone/Game-Zone/bin/Game-Zone.pdb
	Game-Zone/Game-Zone/obj/Debug/Game-Zone.dll
	Game-Zone/Game-Zone/obj/Debug/Game-Zone.pdb
merge
Merge branch 'master' of https://github.com/GroupMayhem/Verk-2013

Conflicts:
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.Tests.dll
	Game-Zone/Game-Zone.Tests/bin/Debug/Game-Zone.Tests.pdb
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.csprojResolveAssemblyReference.cache
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.dll
	Game-Zone/Game-Zone.Tests/obj/Debug/Game-Zone.Tests.pdb
	Game-Zone/Game-Zone.v11.suo