.gitignore Added
Merge to resolve conflicts