tiny update
began on making the feed populate properly with posts and articles AND removed extraneous files
implemented article fetched results controller and tried setting up main table view controller to splice articles in with posts
Merge branch 'master' into parse
Merge branch 'parse' into feed
it builds but doesn't display article cells
addition to 'it builds'
Merge branch 'master' of github.com:Baconthorpe/Greatist_iOS_App_Ever

Conflicts:
	Greatist Message Publisher/Greatist Message Publisher.xcodeproj/project.pbxproj