nothing
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject.v12.suo

	GroupProject/obj/Debug/GroupProject.csprojResolveAssemblyReference.cache