Confilct
Merge branch 'master' of https://github.com/nkming2/libsmartcarcpp.git