cleaning things up
Merge branch 'master' of github.com:streamcards/imageupload