display working
Merge branch 'master' of https://github.com/leftyfb/tweetmachine
merging changes