add paperclip gem
css cleanup
add paperclip and images to user favorites page
commit before merge conflict fix
commit after merge conflict