Thread for Client & Server
Merge branch 'QuangBranch'
Merging Test
Added another test comment.
Merge branch 'QuangBranch'
Merge remote-tracking branch 'origin/TingBranch' into QuangBranch
Merge branch 'QuangBranch'