added .gitignore
initial commit
merged changes on .gitignore