Changed gemfile
Merge branch 'Zack'
edit2
Fixed conflict