Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me into colin
updated paragraph line-height
Updated Feeds Controller Index action, so it returns an ordered list of @feeditems
Added max-width: 100% to imgages displayed within feeds
Added SCSS
Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me
Handle Feedjira error on feed create.
Resolve merge conflicts from pulling from origin master.
updated nav styling
added main.js javascript file
Working AJAX Feed Creation, but still needs work for Subscription creation
Merge branch 'master' of github.com:habibalamin-generalassembly-wdi/feed-me
Merge branch 'colin'
removed stackoverflow rss feed bc it was annoying me :)
Added an Add Feed slidedown with JQuery and replicated AJAX Post functionality
Added SlideUp() when a feed has been submitted
Merge origin master and fix conflicts, plus remove .DS_Store files.
Fix error when user is not subscribed to feed on feeds index view.
Tweaked the dropdown add feed styling and functionality
cleaning up feeds_controller and the related index action