README file
Merge branch 'master' of github.com:stuycs-softdev/proj1-6
Merge branch 'master' of github.com:stuycs-softdev/proj1-6
db created but untested
Merge branch 'master' of https://github.com/stuycs-softdev/proj1-6