Zee plz fix everything

Forgot to change branches.  Merging what should be "User-can-upload-image" branch with master.