Added cocoon gem
Merge branch 'master' of github.com:zhbanton/photo_mixer into categories
Models for interests, categories established
Merge branch 'master' of github.com:zhbanton/photo_mixer into categories
User can add new interests (editing still doesnt work)
User can edit interests
Update images_controller.rb
Merge pull request #18 from zhbanton/categories

Categories