modified feed function
changed feed link to feed
fixed create feed bug again
fixed subscriber count issue on feeds/show
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
modified find function
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
updated nav
updated conditionals for what messages to show/not show depending on whether/how many public/private feeds are available
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev
fixed conflicts with layout
Merge branch 'dev' of github.com:ralphreid/feeds_app into dev