First Commit
Second Commit
Merge branch 'master' of https://github.com/timothy-pratama/-IF3130-Tubes-2-Jarkom.git

Conflicts (resolved):
	Client
	Client.cpp
	Client.o
	ClientReceiverThread.o
	Header/Packet/packetParser.h
	Log/ServerLog
	Server
	Source/Packet/packetParser.cpp
	Source/User/UserService.cpp
	UserService.o
	clientUser.o
	kayu/timmy
	timmy/kayu