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