Merge Branch Master
Merge branch 'master' of github.com:JordySipkema/LD326_RH_A5

Conflicts:
	RH_Server/Server/ClientHandler.cs