Merge branch 'tommy' into Jonathan
Merge branch 'tommy' into Jonathan
Merge branch 'master' into Jonathan
php
what is this?

I have no idea what I'm doing
Merge branch 'master' into Jonathan
Merge branch 'Jonathan'
Added colors and icons
Merge branch 'master' into Jonathan
Merge branch 'Jonathan' of https://github.com/tommynordli/PJ2100_Gruppe34 into Jonathan
Merge branch 'Jonathan' into Frida