Merge conflict
Merge branch 'master' of github.com:Stromner/OOAGrupp6-SP
Updated Server, fixed Client's Communication