[Tak] what?
Merge branch 'master' of github.com:phlip9/txtcoin

merge!