added gitignore to repository
resolved conflicts