In a directory now...
Merge branch 'master' of https://github.com/pandor4/navi-slim