add gitignore
merge mine into master