adding gitignore file
merged more files
merged