La inn Database i egen branch for naa
Merge pull request #1 from EirikZimmerWold/andresly_mergingfiles

Fikset noen småting