Merge branch 'betegelse/new-exercises'