updated gemfile
Fixing gemfile.lock conflicts
Working on pagination fixes