updated views
updated logic
Mere branch 'dev' of github.com:mattstuddert/rss_feed_reader into dev
fixed conflics
updates