start adding features
work more on features
Merge branch 'master' into add-more-features
try using carrierwave
add image uploads for swatches
users can upload and delete swatches from lacquer edit page
add swatches
Merge branch 'add-more-features'