Merge branch 'master' of https://github.com/calblueprint/usomc-rails

* 'master' of https://github.com/calblueprint/usomc-rails:
  edit method pieces
  title_plus_some_other_changes
  edit method pieces
  edit method pieces
  what we'll go with for now
  added copyright to rework
  REWORK OF WEBSITE FRONTEND
Merge branch 'master' of https://github.com/calblueprint/usomc-rails

* 'master' of https://github.com/calblueprint/usomc-rails: (28 commits)
  Clear password reset tokens after use
  silencing rails asset pipeline in dev
  finally got the schema updated
  rebumping correct schema
  bumping schema
  Password edit form
  Complete
  Mailer
  Password reset form and controller and fields in model
  PasswordResets controller
  Use Time.zone.now instead of DateTime.now
  slight adjustment
  eventrank model
  drastic view change again
  Fix style
  The edit button is only seem on their own profile
  Adding comments model
  adding blank methods
  adding events#users method
  Edit link now appears on profile page
  ...
Add relations to judges and events
Merge pull request #53 from calblueprint/howard/event_judges

Howard/event judges