Adding each of the different timelines
fixing z of dialog
Merge remote-tracking branch 'upstream/master' into twit_list
Merge pull request #13 from diegosarmentero/twit_list

Twit list