Testing meld
Merge branch 'jose' into dev
Fixed gitignore after bogus merger
Testing meld
Testing meld
Fixed bogus merger