Get werkt
Merge branch 'master' of https://github.com/PehrGit/CPP2OS3

Conflicts:
	Client/DP-Client/DP-Client/Form1.cs