merging on server
Merge branch 'master' of https://github.com/TeamChahlie/IntraSMUrals

Merge
Merge branch 'master' of https://github.com/TeamChahlie/IntraSMUrals

Merge
Merge branch 'master' of https://github.com/TeamChahlie/IntraSMUrals

Merge
Merge branch 'master' of https://github.com/TeamChahlie/IntraSMUrals

Merge
Merge
minor adaptations for the server