maybe now
Removed Gemfile.lock
Merge branch 'development'