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