conflict resolution
Merge branch 'master' of github.com:fnha2000/CS1635BookSharing