cmt
Merge branch 'master' of https://github.com/Maethe/WedstrijdQFrame

Conflicts:
	SamenSterker/SamenSterker/SamenSterker.csproj
UI
Merge branch 'master' of https://github.com/Maethe/WedstrijdQFrame

Conflicts:
	SamenSterker/SamenSterker/SamenSterker.csproj