M homefeed

Christina's twitter homefeed page with merge conflicts fixed.