JMS stuff, making texture demo work on mac
Merge branch 'master' of git@github.com:rubil4x/cmsc425.git