Updating
Updating
Adding gitignore
Fixing conflicts