kill old trol. file
Merge branch 'master' of github.com:zackkitzmiller/nil