figaro
Fix conflicts in Gemfile.lock
Merge pull request #30 from Benoitlecorre/heroku

figaro