I hate git sometimes.
Merge branch 'master' of github.com:ftrimble/KingMe-web

* 'master' of github.com:ftrimble/KingMe-web:
  Attachment on ride.rb