updated controller
fixed merge conflict.. prob
Merge pull request #20 from willtsay/will

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