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

Fixed date on insertBook() and showBook().
Finished Librarian transaction
Merge pull request #25 from g2-aj/branch_lin

Branch lin
Merge branch 'master' of https://github.com/g2-aj/cs304 into branch_kris