First iteration Polymorphic Comments and Commentable
Resolving merge conflicts.

Bug in Comment Upload, the content is nil. I expect that problem is in the params in CommentsController.
Adjusting params to accept comment attributes
Merge conflict with db/schema.rb
Need ids for Shops
Test Driven Development of Comments on Shop pages
Revised HTML and css to add more clarification to the side for the end user.
 Now this crap again with Travis... Working to resolve
 Now this crap again with Travis... Working to resolve
updated styles and such
 resolving merge conflict by adding .ds_store to .gitignore file and modifying .travis.yml file
Merge branch 'marketing'
 adding revised files from resolved merge conflict
Merge branch 'styles'
Dynamic Ratings Iteration 1 to be merged with current Master
Dynamic Ratings merged with Lastest Master