progress bars turn to buffer bars during buffering, and back to progress bars when buffering is done. but buffer bars lack styling so they're invisible
added jquery uis to vendor assets, and linked to it in application.js
merge conflict in app asset manifest resolved
svg code replaced with image tag linking to svg. trash can included too
buffer bar
Merge branch 'm' into buffer-bar
bigger trash cans
buffer bar fix