modify .gitignore
add Settings header file
correct pull problem