resolved conflict
Merge branch 'master' of https://github.com/andou/node-car
commit