tinkered and fixed minor db bugging
Merge branch 'master' of https://github.com/dcavoulacos/project1
resynched local branch with master