updated gemfile to resolve merge conflicts
updated gemfile to resolve merge conflicts

UM-USElab/gradecraft-development,mkoon/gradecraft-development,mkoon/gradecraft-development,UM-USElab/gradecraft-development,UM-USElab/gradecraft-development,mkoon/gradecraft-development,UM-USElab/gradecraft-development