Added a new controller Home with an index, and created a new class that parses RSS FEEDS YAY
Im commiting
I hope i havent deleted anything important.
Fixing dem merges
User details show and edit pages added. User controller created. CarrierWave implemented.
dashboard create new feed functions added, add url, feeds controller index and create methods updated
fixed conflict on sidebar
pushing up merged file with feature/dashboard
Issues with login. Working on fix
migrated categories in place of tags in FeedUser model
Fixed merge conflict in haml
Added some check to avoid nil errors, commiting incase I need to roll back.
Updated sidebar layout and css styling
Added logo mockup
Implemented feature to only display user subscribed feeds. (Modified the views, controller and modelsfor Feed)
Sidebar javascript toggle hide added
Removed the hidden params in sidebar
Completed branch. Sidebar toggle fully functional
Resolved merge conflicts and updated toggle sidebar function
Minor updates to the Feeds controller