added basic profile view
fixed merge conflicts in index.html
photos showing with s3 and paperclip