added git ignore file
resolving merge issue with gitignore