basic devise login added, home controller, hompage view added. New User saves to database
editied app controller, added feeds controller and home controller. Added feeds index, routes for feeds, posts, users
Merge branch 'feature/login'
feature/login branch merged
Added migration removing etag from Feeds table. Created home page view with no sidebar.
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