edited item/edit form and user show page for profiles
more changes
fixed merge conflicts
add seed data for user images
Merge branch 'master' of github.com:daniellecs/project_craig