Cleans up the Gemfile
fixing gemfile
Update the bundle
Resolving merge conflicts
Merge branch 'feature/campaigns' of https://github.com/fergmastaflex/lifecraft into feature/campaigns