Merge pull request #11 from afalsario/alex

BugFix:
adding image uploads
Merge pull request #12 from afalsario/afalsario

adding image uploads
Merge conflict resolved