Updated .gitignore
Fixed conflict with gitignore
Merge remote-tracking branch 'origin/jose' into dev
Merge remote-tracking branch 'origin/jose' into dev
Testing meld
Merge branch 'jose' into dev
Fixed gitignore after bogus merger
Testing meld
Testing meld
Fixed bogus merger