t
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
Merge branch 'master' of https://github.com/umass-cs-326/team-uframe
added dbcredentials.json file so we can all specify our own username/password for mysql
merging