fixups after merge
Merge branch 'master' of github.com:new299/hackterm