Updates
Adding gitignore to resolve conflict