Twitter OAuth
resolved merge issues