added devise with user and admin
added book feature
added features to add and delete books; modified layouts
created book/user association with lend_books table; modified navbar layout
user can add books to My Bookshelf
moved LendBooksController actions to BooksController
made changes to reader delete test and controllers
fixed association bug
working version of search query
modified search feature
fixed bugs in search query
fixed bugs in search query
modified search feature; added location of booklenders to search
resolved merge conflict
Merge pull request #1 from tomatoturnip/profile

Profile