merge
added gitignore file
.gitignore is now working