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
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'