ball for ray
Merge branch 'master' of https://github.com/Chocolancer/techpro2