merge + gjort databasen till untracked
merge
merge .gitignore
merge......
merge..........