Upgraded to Rails 4.
Updated code to remove deprecated mass-assignment code.
Changed before_filter to before_action.
Changed PUT to PATCH.
Removed outdated plugins directory.
Resolved conflict in Gemfile.lock to complete merge
Merge branch 'master' of github.com-cangevine:cangevine/STEAMnet