database functionality (currently broken due to asynchronicity)
Merge branch 'master' of https://github.com/lockan/Group5Repo
re-committing and pushing :(