Conflict resolved twitter feed

Hey @manubete fixed the index file for a merge conflict. Looks good to merge with master! Go ahead and accept it!