For merge
Merge branch 'master' of github.com:nanaHa1003/NTU.PDP-Term-Project

Conflicts:
	PDP Term Project/Client.h