minor comments
resolved conflict
removed second argument of to_relation
Merge branch 'master' of https://github.com/formare/auctions
clarified comment on to_relation edit