added paperclip gem, changed views
fixed conflicts