Merge branch 'master' into branch_lin
Merge branch 'master' into branch_lin
Merge branch 'master' into branch_lin
Merge branch 'master' into branch_lin
Merge pull request #28 from g2-aj/branch_kris

Tweaked populate tables sql script, added and tested show functions in Book.Java
Corrected search borrower sql queries
testing clerk transactions -- add borrower, fixed small bugs
Merge pull request #30 from g2-aj/g3-ks

Corrected search borrower sql queries
manually merged conflict
Merge pull request #31 from g2-aj/branch_alshahna

testing clerk transactions -- add borrower, fixed small bugs
Finished librarian function
Merge branch 'master' into branch_lin
Manual Merge
Merge pull request #32 from g2-aj/branch_lin

Branch lin
tested Checkout items in clerk, fixed bugs within insert borrowing tuple and within check out items for borrower
Merge pull request #33 from g2-aj/branch_alshahna

tested Checkout items in clerk, fixed bugs within insert borrowing tuple...
manual merge conflict of main solved for alshahna's use
tested checkOutItems in clerk, made necessary bug fixes
Merge pull request #34 from g2-aj/branch_alshahna

Branch alshahna
tested checkOverdueItems in clerk