im onlly committing this so i can pull from master
resolved merge conflicts
resolved sql script merge errors
resolved merge conflicts
fixed merge errors
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
added Kris's tests
additional testing to check Al-shahna's checkout but. The version without gui was tested and works fine
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
removed unnecessary showBorrower() in Borrower.java class
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris
updated kris's code to latest release
added processReturn and checkOverdueItems buttons (no action yet)
Merge pull request #48 from g2-aj/branch_kris

added two buttons graphics ( no action on press as of yet, I am working on processReturn)