branch 'master' of https://github.com/amc0/Datakommunikation

Conflicts:
Lab1/webbserver
v.0141