fix_ignore_file
Merge branch 'master' of github.com:lizouzt/lizouzt.github.com