Fixed merge conflicts, can successfully create user, log in, and add items to the database.
Merge branch 'master' of https://github.com/oharace/RHIT-Borrowing-Android-App