Merging with tweet_with_user feature branch
Merge branch 'tweet_with_user' of github.com:dannguyen/t into tweet_with_user