Updated gemfile.lock
Fix merge conflict
our app can now email people from the console