add twitter auth
test twitter
testing twitter
testing git
resolve merge conflicts with current master