Merge pull request #17 from RKim220/angular

merge twitter in same controller
update twitter controller
update feed controller