fix .gitignore
pull origin master