Fix B7
Merge branch 'master' of https://github.com/ran0005/DatabaseProject