Changes in client
resolved conflict
Merge branch 'master' of https://github.com/Gunior/Thema-Opdracht-8