added gitignore
update from master