added some calc_jphi calls to gs_solver.cc
Merge branch 'master' of https://github.com/jonngwx/grad-shafranov

Conflicts:
	gs_solver.cc

adding some calc_jphi calls to gs_solver.cc