merge conflict on app/views/users/index.erb
Merge branch 'master' of github.com:astopo/book-orbit
debugged all_user_collections helper