added git ignore
merge