gemfile.lock merge
Merge branch 'resque' of https://github.com/lingerio/web_app into resque
creates mailgun_sender