added gitignore
merged from head