added texture support
Merge branch 'master' of ssh://git@github.com/d-qoi/compsciProject.git