Hopefully working upload/edit
Merge branch 'master' of github.com:rllhenson/ecommerce