thachbranch
photo upload added
paperclip
resolve merge conflict