Some changes
Merge branch 'master' of https://github.com/Isacar/Comp-311-Nim

Conflicts:
	NIM/NIM/client_main.cpp