merged
added gitignore