Fixing image upload that broke during merge
Merge branch 'master' of https://github.com/noahfradin/lotteria