Merge branch 'master' into branch_lin
Merge branch 'master' into branch_lin
Commit
Fixed conflicts
Merge pull request #59 from g2-aj/branch_kris

added console redirect to our gui
Finished GUI for addnewbook
Merge branch 'master' of https://github.com/g2-aj/cs304

Conflicts:
cs304_p3/src/com/library/branch/LibraryBranch.java
populate_library_tables.sql
Finished GUI for Addnewbook
Merge branch 'master' into branch_lin
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
Finished GUI for librarian