Finished Nonlinear Conjugate Gradient Solver, switched lab2 for new
solver