Additional changes to database class
Merge branch 'master' of https://github.com/Miaplacidus/Running_Buddy

Yet another merge commit