update ignore
Merge branch 'master' of github.com:dragondjf/QCFramer
delete
fix conflict