Cleaned and rebuilt project.  Resolved remaining conflicts.  Readded
NewsFeed class.