Commit
Fixed conflicts
fixed hold requests
manual merge
Merge pull request #60 from g2-aj/branch_alshahna

Branch alshahna
Merged
fixed borrower gui
Fixed double action listener bug for outstanding fines
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_alshahna
Merge pull request #61 from g2-aj/branch_alshahna

Branch alshahna
Fixed action listener bug for outstanding fines
Merge pull request #62 from g2-aj/g3-ks

G3 ks
Merge pull request #63 from g2-aj/branch_lin

Branch lin
updated library UI
Merge pull request #64 from g2-aj/branch_alshahna

updated library UI
Merge branch 'master' into branch_lin