added updated db1 thingy
Merge branch 'master' of github.com:finninde/fellesprosjekt