im onlly committing this so i can pull from master
resolved merge conflicts
resolved sql script merge errors
beginnings of a UI
Added tests for borrower transactions
resolved merge conflicts
Merge pull request #42 from g2-aj/branch_lin

Branch lin
Merge branch 'master' into branch_lin
fixed merge errors
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
clerk menu for add borrower working
Merge pull request #43 from g2-aj/branch_alshahna

Branch alshahna
Merge branch 'master' into branch_lin
added Kris's tests
gui for check out items in clerk menu started
Merge pull request #44 from g2-aj/branch_alshahna

gui for check out items in clerk menu started
Fixed conflicts
Merge branch 'master' of https://github.com/g2-aj/cs304 into g3-ks
clerk check out gui window now updated
Merge pull request #45 from g2-aj/branch_alshahna

clerk check out gui window now updated