7.07
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/internship.exe
	Debug/internship.pdb
	internship.sdf
	internship.suo
	internship/Debug/Agent.obj
	internship/Debug/AssemblyInfo.obj
	internship/Debug/CL.read.1.tlog
	internship/Debug/CL.write.1.tlog
	internship/Debug/Painter.obj
	internship/Debug/Server.obj
	internship/Debug/internship.log
	internship/Debug/internship.obj
	internship/Debug/internship.pch
	internship/Debug/internship.vcxproj.GenerateResource.Cache
	internship/Debug/newAgent.obj
	internship/Debug/stdafx.obj
	internship/Debug/vc100.pdb