Added a comment to the factories.rb file
Merge branch 'master' into questions
Corrected the tables to use polymorphic commentable for comments
fixed merge conflict