upload photo displays properly, not passing through
Merge branch 'master' of https://github.com/laurajg/147Project