Remove unused texture
update gitignore
Merge remote-tracking branch 'upstream/master'