add clang-format file
remove file
Merge remote branch 'origin/master'