modified gemfile
merge coflicts
updated sort js