updated views
created basic welcome page when no current user signed in and rooted to it
did some stuff
updated logic
Mere branch 'dev' of github.com:mattstuddert/rss_feed_reader into dev
fixed conflics
added pagination, tried private/public
updates
design and views
added post tagging
conflicts in stylesheets confirmed
resolved merge conflicts
udpading vuews
pulling updates
Merge branch 'dev' of github.com:mattstuddert/rss_feed_reader into views
views
Merge branch 'views' into dev
added cancan
merging profile changes
:w
gerge branch 'dev' of github.com:mattstuddert/rss_feed_reader into dev
subscribe feature resolved