merge
added gitignore