working on index
cleaned up assets
Merge branch 'master' into feeds_index

merge
brought in images from all of user's feeds
Merge branch 'master' of github.com:pnblackwell/feed_engine

merge
Merge branch 'master' into feeds_index

merge
beginning styling for feeds index
added 500px keys
merged master, cleaned assets
added minimagick to feed.rb
changed tabs in dashboard for better flow
Added pictures into the dashboard so that you can see a more compelte view of your feeds
fixed link to feeds within dashboard
added kaminari
got rid of kaminari, added will_paginate
reduced number of feed item photos per feed
removed will paginate
cleaned up extraneous code from dashboard fix, resolved merge conflicts with master
merged feeds index with FULLY UPDATED master
Merge branch 'master' into feeds_index