fixed untracked files
Merge branch 'master' of https://github.com/wyying/conf_file

merge
NULL