finish db
Merge branches 'master' and 'master' of github.com:CMPUT301F13T09/BearGitAndroid