database mekk
Merge branch 'database' of ssh://git@github.com/jonasws/Fellesprosjekt.git into database