Merge branch 'master' of https://github.com/willtsay/console_texter into...

... tommy