pull changes from github, edit .gitignore to remove odd chinese characters