working again
Merge branch 'master' of https://github.com/billpull/Twitter-Ticker