added .gitignore file
merge conflicts resolve
git test