Modified database retrieval
Merge branch 'master' of https://github.com/HackathonTeam/Class_DataBase

merging