styled the carrierwave image
changed subscriptions view to show the titles of feeds you have subscribed to
subscription remedy
fixed conflicts
removed empty files and added a readme. More work on bugs