added .gitignore file
merged master