Test branching
Add calculateX function.
Rename getImageColors and resolve_texmap to getRingTexture and getTriangleTexture.
Test merge branch.