android works!!
Merge branch 'newcode' into improved_glprogram