Added .gitignore file
adding git ignore
merged master