Merge remote-tracking branch 'origin/feature_addPersonTracking' into featur...

pansen

2018-12-26 4001288af80a5e07bb96dd2a7d41d7cb0052a560

 .gitignore

@@ -19,3 +19,13 @@
*.exe
*.out
*.app

\.idea/

syncDBTool/cmake-build-debug/

QiaoJiaSystem/cmake-build-debug/

QiaoJiaSystem/YoloServer/cmake-build-debug/

syncDBTool/\.fuse_hidden00038cb8000000da