Initial Rails 4.0.x upgrade
Merge branch 'master' of https://github.com/OWASP/railsgoat into rails4
More Rails 4.0 upgrade changes
 1. Compared existing branch with empty Rails 4.0 project and
    made changes as needed.
 2. Fix find/first warning.
 3. Fix sqlite timeout issue.
    -- config/database.yml
    -- spec/vulnerabilities/insecure_dor_spec.rb
Upgraded Rails to 4.0.10
Undid my find/first fix
Changed timeout to 25000 for all envs
Upgraded to Ruby 2.1.3; Changed timeout value
Update to railsgoat
Fix Gemfile.lock file conflict
Upgraded 2 gems by rebuilding Gemfile.lock file; Fixed find/first dep warning #158
Merge branch 'master' into rails4
 On branch strong-params
 Your branch is behind 'origin/strong-params' by 1 commit, and can be fast-forwarded.

I'll pull to catch up after this commit
Change code to whitelist params
Remove attr_accessible lines
Add strong_params to Gemfile, since this branch is still on Rails 3
Mixin to ActiveRecord::Base ActiveModel::ForbiddenAttributesProtection
Use an initializer for the mixin
Merge branch 'strong-params' of github.com:jfnixon/railsgoat into strong-params

Somehow I wound up a commit behind. Catch up.
Add changes
Merge branch 'strong-params' of https://github.com/jfnixon/railsgoat into jfnixon-strong-params
Added Fred's Strong Parameter work
Merge branch 'rails4'
Upgraded rails to 4.0.12