Sprokets
Changes to model
Fixing merge conflicts
Merge conflict in model
Added sprockets