Upgraded 1 gem by rebuilding Gemfile.lock file
Merge branch 'master' of https://github.com/OWASP/railsgoat
Merge pull request #156 from jasnow/master

Upgraded 1 gem by rebuilding Gemfile.lock file
Fix Gemfile.lock file conflict