Teacher
Merge origin/databaseEndringer into databaseEndringer