here you go
Merge branch 'master' of https://github.com/hakonm/PJ3100-14-Gruppe-1
this works nao?