Added cg_solve2

This method incorporates the cg_init method and reduces the number of
calls to norm(r,r) from 3 to 1.