modified:   database.cpp
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3