add .gitignore

tabspace
can't help to commit changes of .vim/.netrwhist
solve the conflict with remote by 'merge'