Mid-refactor separating image upload and add photo
Merge branch 'master' of https://github.com/saturnial/bigdig