Get/Post Controller and view for uploading photos from webapp
.DSTORE in gitignore needs to be .DSStore
fixed merge conflict