shaders now linking
Merge branch 'master' of https://github.com/tadeegan/ModelMarket shader merge
Merge branch 'master' of https://github.com/tadeegan/ModelMarket