resolve confilict
Merge branch 'heroku_view' of https://github.com/Wei-Lu/book_club into heroku_view