Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject.v12.suo
	GroupProject/bin/GroupProject.dll
	GroupProject/bin/GroupProject.pdb
	GroupProject/obj/Debug/GroupProject.dll
	GroupProject/obj/Debug/GroupProject.pdb

Merge remote-tracking branch
'origin/master'

Conflicts:
	GroupProject.v12.suo
	GroupProject/bin/GroupProject.dll
	GroupProject/bin/GroupProject.pdb
	GroupProject/obj/Debug/GroupProject.dll
	GroupProject/obj/Debug/GroupProject.pdb

mm
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroupProject.v12.suo
	GroupProject/bin/GroupProject.dll
	GroupProject/bin/GroupProject.pdb
	GroupProject/obj/Debug/GroupProject.dll
	GroupProject/obj/Debug/GroupProject.pdb