pull in user-item-forms
Merge branch 'user_item_forms' of https://github.com/redswaggon/red-wagon into authentication
add brewfile for imagemagick
gem
resolve conflicts
not working
resolve conflicts
EMILY IS THE BEST -- AUTH WORKS WOOHOOOOO
fixed merge errors
resolve conflicts