add .gitignore
merge with remote