I can't spell expertise
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/clientHandler.cpp