clean up
Merge branch 'master' of https://github.com/XicoMBD/ninja-is-kill