adding photosignup view
merge conflict
merge conflicts with images