got triangle and square to show up!
Merge branch 'master' of github.com:jhuang314/webgl