fix Gemfile and bundle install
fix Gemfile
 fix Gemfile.lock
Add fish
Merge branch 'add_fish'