bundle update
fix merge conflict
add js for multiple image upload.. still in progress
Merge pull request #9 from oconn/jquery_file_upload

Jquery file upload