add flash to gemfile and environment.rb
adding flash; fixing merge conflict
Merge branch 'flash'; just adds flash to environment and gemfiles. I don't know why this created a merge conflict but it did.