created new main screen
resolve conflicts
resolving rss conflicts
Merge pull request #192 from gwesterfieldjr/view-flipper

Main Screen View Flipper