fixing gemfile and adding stuff
Merge branch 'hello' into staging