Edge text
Merge branch 'master' of github.com:timvdalen/2II25-project