vm thing
Merge branch 'master' of https://github.com/almc/nao_basic