committing polymorphic changes for merge with master
fix merge conflict
Update schema.rb
Merge pull request #11 from oconn/comments

Comments