Merge branch 'master' of C:\Users\Elise\Dropbox\ITU\1. semester\GRPRO\eksamensprojekt-git\grpro_project_emr with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added methods to get the reservation data from the database.